Commit Graph

20477 Commits

Author SHA1 Message Date
Jason Monk
096d75f7b3 am 59687613: am 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev
* commit '59687613049588d4d09af0a8f5e5da5287a14657':
  Fix crash on unistalling app
2015-05-08 17:37:11 +00:00
Jason Monk
5968761304 am 4d1efa0e: Merge "Fix crash on unistalling app" into mnc-dev
* commit '4d1efa0e6da65f20f1baf827abee97df6551c277':
  Fix crash on unistalling app
2015-05-08 17:24:09 +00:00
Jason Monk
4d1efa0e6d Merge "Fix crash on unistalling app" into mnc-dev 2015-05-08 17:16:41 +00:00
Jason Monk
da0f2a782e am 4ba24b92: am 7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
* commit '4ba24b92c75d80847247432044bd3a86c3154641':
  Fix crash in settings -> apps after adding profile
2015-05-08 16:40:37 +00:00
Erik Kline
16aa45ad50 am 3704367e: am c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev
* commit '3704367ec32a3d80014e20ff372fd24d937c118c':
  Add settings for persisting the mobile data connection.
2015-05-08 16:40:22 +00:00
Yohei Yukawa
876dd465fb am 4053c047: am 6a03d113: Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
* commit '4053c047f2dd818a663f8938fa896a6c4f933ec7':
  Making the behavior deterministic when the IME picker is shown.
2015-05-08 16:38:40 +00:00
Fabrice Di Meglio
3d758c0ab0 am 76215816: am 99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
* commit '7621581682e595ce610d8a3a7e70ce7c483ad01b':
  Add user selectable Default Browser feature - part 4
2015-05-08 16:38:11 +00:00
Jason Monk
a9862cae7a Fix crash on unistalling app
Only update the battery info if the app exists.

Bug: 20918104
Change-Id: I61481be53cfc72d49868f14a940a09c83f7a5cc2
2015-05-08 11:37:01 -04:00
Jason Monk
10e1a94ef7 Choose correct network template for data history
Bug: 19921796
Change-Id: I90376ed0314c47fcbee21c81b85f60d3cc3312a6
2015-05-08 11:24:03 -04:00
Jason Monk
4ba24b92c7 am 7ef58584: Merge "Fix crash in settings -> apps after adding profile" into mnc-dev
* commit '7ef58584e66e077ee7930ae100cc1a1915cd7b1a':
  Fix crash in settings -> apps after adding profile
2015-05-08 14:59:42 +00:00
Jason Monk
7ef58584e6 Merge "Fix crash in settings -> apps after adding profile" into mnc-dev 2015-05-08 14:48:54 +00:00
Jason Monk
e4ccf87839 Fix crash in settings -> apps after adding profile
Bug: 20652411
Change-Id: I766f99ee520ab106ec2765c77057042ed14e8fed
2015-05-08 10:18:48 -04:00
Erik Kline
3704367ec3 am c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev
* commit 'c0df6623a0eb0ebbdb965111269b96d9f4a4b976':
  Add settings for persisting the mobile data connection.
2015-05-08 09:23:38 +00:00
Erik Kline
c0df6623a0 Merge "Add settings for persisting the mobile data connection." into mnc-dev 2015-05-08 08:12:21 +00:00
Yohei Yukawa
4053c047f2 am 6a03d113: Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev
* commit '6a03d11328da5f2ce7c685f613d706fbfa589fdd':
  Making the behavior deterministic when the IME picker is shown.
2015-05-07 23:28:11 +00:00
Yohei Yukawa
6a03d11328 Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev 2015-05-07 23:20:27 +00:00
Seigo Nonaka
e792729b4c Making the behavior deterministic when the IME picker is shown.
In the language & input settings, the auxiliary IME subtypes have been
hidden since they should not be a default.  With Id156c85535a22, now we
can explicitly control the behavior of input method picker.
Note the this CL should not change any user visible behaviors.

Bug: 20763994
Change-Id: I9f797d07ba02363fab58ceb9aecb3cc11fbc407e
2015-05-07 23:18:49 +00:00
Chad Brubaker
7236f2abba Track keystore password method changes
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
2015-05-07 16:14:51 -07:00
Fabrice Di Meglio
7621581682 am 99245d13: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
* commit '99245d13e9ac2fabe1300929a3a669f1d186070e':
  Add user selectable Default Browser feature - part 4
2015-05-07 22:47:47 +00:00
Fabrice Di Meglio
99245d13e9 Merge "Add user selectable Default Browser feature - part 4" into mnc-dev 2015-05-07 22:37:06 +00:00
Fabrice Di Meglio
00b5a67a2e Add user selectable Default Browser feature - part 4
- refresh Browser list depending on package installation / removal

See bug #20144393

Change-Id: I529f6e0bd8b5bd4cae1dea9479acfca9cf9a6b26
2015-05-07 15:34:21 -07:00
Raju Yadav
85472aa039 am 787f00f9: am 92331e51: Avoid SElinux denial accessing IMEI information
* commit '787f00f99255b63176f599b3e6c5ff13b48cf884':
  Avoid SElinux denial accessing IMEI information
2015-05-07 21:21:15 +00:00
Raju Yadav
787f00f992 am 92331e51: Avoid SElinux denial accessing IMEI information
* commit '92331e51eadb717a15626083b52a820c236dc1cd':
  Avoid SElinux denial accessing IMEI information
2015-05-07 21:09:22 +00:00
Jason Monk
f86cddb3ef am 62b8ffae: am 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev
* commit '62b8ffaec80eef1c2b0060cc2128b45dfc0bea28':
  Detect uninstalled apps during resume
2015-05-07 20:59:36 +00:00
Raju Yadav
92331e51ea Avoid SElinux denial accessing IMEI information
Set persistent attribute to false so preferences are not
stored in shared preferences, this avoids the SElinux
denial:

  W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \
  denied { search } for name="com.android.settings" \
  dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \
  tcontext=u:object_r:system_app_data_file:s0 tclass=dir\
  op_res=-13 ppid=319 pcomm="main" tgid=1589\
  tgcomm="m.android.phone"

Observed when entering IMEI information in:
Settings > About Phone > Status > IMEI information.

It makes no sense to store this information in shared
preferences anyway so no functinoality is lost with this
change.

(cherrypicked from commit b2ad5bb522)

Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c
2015-05-07 13:54:54 -07:00
Jason Monk
62b8ffaec8 am 97cebec1: Merge "Detect uninstalled apps during resume" into mnc-dev
* commit '97cebec1a0975e1a85a4bbb0024e403c655722a8':
  Detect uninstalled apps during resume
2015-05-07 20:45:40 +00:00
Jason Monk
97cebec1a0 Merge "Detect uninstalled apps during resume" into mnc-dev 2015-05-07 20:36:17 +00:00
Jason Monk
4cbf9b2d58 Detect uninstalled apps during resume
Also cleanup disabled apps check while here

Bug: 20651305
Change-Id: I5ba8f6e7aee817842bb2ae2ee825647089bcacd3
2015-05-07 16:30:05 -04:00
Jason Monk
6cb0aee42e am c6f3d75d: am f4db340d: Consistently use weight to get average mem usage
* commit 'c6f3d75d777bc0dd2f30b1cb98e8a434d96a3e7b':
  Consistently use weight to get average mem usage
2015-05-07 20:14:57 +00:00
Jason Monk
c6f3d75d77 am f4db340d: Consistently use weight to get average mem usage
* commit 'f4db340daeb50572d7e0ab12f4745affae8b567f':
  Consistently use weight to get average mem usage
2015-05-07 20:07:46 +00:00
Jason Monk
f4db340dae Consistently use weight to get average mem usage
Rather than just for the labels...

Also update bg mem to be converted to the same memory scale for
the bars.  Also undo some bad average calculations that only made
things worse.

Bug: 20694769
Change-Id: I676803bf76d336355441891e768ba3c228dbfbca
2015-05-07 15:44:37 -04:00
Jason Monk
ea9dae2ebf am 216d9bcb: am e2d63fef: Merge "Updates/fixes to memory settings" into mnc-dev
* commit '216d9bcb7f58e953d75d919153661e3d61af8109':
  Updates/fixes to memory settings
2015-05-07 19:11:27 +00:00
Jason Monk
782b0e8210 am ad28b967: am 68d6d465: Merge "Always start storage list sorting by size" into mnc-dev
* commit 'ad28b9671664fb4468184a6cd293e0226015758e':
  Always start storage list sorting by size
2015-05-07 19:11:26 +00:00
Jason Monk
216d9bcb7f am e2d63fef: Merge "Updates/fixes to memory settings" into mnc-dev
* commit 'e2d63fef3ccbfd3001b7e794b3ee1203fc1c77af':
  Updates/fixes to memory settings
2015-05-07 18:54:51 +00:00
Jason Monk
ad28b96716 am 68d6d465: Merge "Always start storage list sorting by size" into mnc-dev
* commit '68d6d465746a6dcec6f7e0a44fadae19b886fa42':
  Always start storage list sorting by size
2015-05-07 18:54:50 +00:00
Nick Kralevich
d273dd260e am a6867f55: Merge "Avoid SElinux denial accessing IMEI information"
* commit 'a6867f55e5a46eda1013e466a7bb5676fcebe67e':
  Avoid SElinux denial accessing IMEI information
2015-05-07 18:44:41 +00:00
Raju Yadav
05fb069d65 Remove phone information for a secondary user
Default phone information is not available for a secondary
user and when accessed using service command *#*#INFO#*#*,
it causes crash in Settings. Removed the preference for a
secondary user.

To verify:
1. Add user(slide down status bar>user icon>Add user>
   OK>finish the setup guide).
2. As new user launch Phone app>input “*#*#4636#*#*”>
   tap Phone information>check
Causes Settings to crash with:
  Caused by: java.lang.IllegalStateException: Default phones haven't been made yet!
  at com.android.internal.telephony.PhoneFactory.getDefaultPhone(PhoneFactory.java:214)
  at com.android.settings.RadioInfo.onCreate(RadioInfo.java:263)
  at android.app.Activity.performCreate(Activity.java:5990)
  at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1106)
  at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2278)

Change-Id: Ie23107c5eead04183cfd8b5460a9a7a3426a99b8
2015-05-07 20:22:24 +02:00
Nick Kralevich
a6867f55e5 Merge "Avoid SElinux denial accessing IMEI information" 2015-05-07 18:21:18 +00:00
Alan Viverette
691f792968 am 38c88336: am 840002d6: Merge "Use theme colors in battery stats widget" into mnc-dev
* commit '38c883363d6d3845dc5746f7dd5ebd9ba8b4a304':
  Use theme colors in battery stats widget
2015-05-07 17:48:37 +00:00
Jason Monk
e2d63fef3c Merge "Updates/fixes to memory settings" into mnc-dev 2015-05-07 17:45:39 +00:00
Jason Monk
1de522323f Updates/fixes to memory settings
- Update memory states to be Good performance, Ok performance, etc.
 - Update header info to be based on history rather than
   instantaneous
 - Color memory bar differently based on state
 - Fix run frequency bucketing to be correct
 - Show dialog for selecting duration, and fix duration selection
 - Update process naming to:
      - If process name is "anything:xxxx" then show "Xxxx"
      - If process name is "com.app.package.interface" then show "Interface"
      - If process name is the package name then show the app name
      - Otherwise fallback to the process name string

Bug: 20694769
Change-Id: Ic1fab28bfd2422bde84dd10bd305a4cc34be98cf
2015-05-07 13:45:08 -04:00
Jason Monk
68d6d46574 Merge "Always start storage list sorting by size" into mnc-dev 2015-05-07 17:35:39 +00:00
Alan Viverette
38c883363d am 840002d6: Merge "Use theme colors in battery stats widget" into mnc-dev
* commit '840002d66c19af51618489850c7ccea465cd23f8':
  Use theme colors in battery stats widget
2015-05-07 17:30:02 +00:00
Raju Yadav
b2ad5bb522 Avoid SElinux denial accessing IMEI information
Set persistent attribute to false so preferences are not
stored in shared preferences, this avoids the SElinux
denial:

  W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \
  denied { search } for name="com.android.settings" \
  dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \
  tcontext=u:object_r:system_app_data_file:s0 tclass=dir\
  op_res=-13 ppid=319 pcomm="main" tgid=1589\
  tgcomm="m.android.phone"

Observed when entering IMEI information in:
Settings > About Phone > Status > IMEI information.

It makes no sense to store this information in shared
preferences anyway so no functinoality is lost with this
change.

Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c
2015-05-07 19:18:39 +02:00
Jason Monk
069732c5f9 Always start storage list sorting by size
Bug: 20075068
Change-Id: I50a39decaa61bf7c3489243924c0d3928c4fe2ce
2015-05-07 13:09:48 -04:00
Alan Viverette
840002d66c Merge "Use theme colors in battery stats widget" into mnc-dev 2015-05-07 16:57:10 +00:00
Jason Monk
6e08b72006 am bb70e07f: am 59de14e2: Merge "Fix app headers in settings" into mnc-dev
* commit 'bb70e07f8354e3f466a7b93bf11669c5d91de9eb':
  Fix app headers in settings
2015-05-07 14:54:49 +00:00
Jason Monk
bb70e07f83 am 59de14e2: Merge "Fix app headers in settings" into mnc-dev
* commit '59de14e2197e84baf663fa700ee7b2323fbaef6b':
  Fix app headers in settings
2015-05-07 13:17:43 +00:00
Jason Monk
59de14e219 Merge "Fix app headers in settings" into mnc-dev 2015-05-07 13:08:29 +00:00
Jeff Brown
c9189165a3 am 1df96a42: am 92d6b09e: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
* commit '1df96a424c56ca502e6cafb6fc195a87f464f2de':
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
2015-05-07 05:28:57 +00:00