Baligh Uddin
b09878b850
Import translations. DO NOT MERGE
...
Change-Id: I3c136ce6349c35f3cec69d12f355daaf1e8912b5
Auto-generated-cl: translation import
2013-08-19 12:03:06 -07:00
Christopher Tate
a218e732b0
Don't crash when procstats has data for a now-disused uid
...
That is, PackageManager.getPackagesForUid(uid) can return null,
so deal with it.
Bug 10374656
Change-Id: I4eacd48c809b778e131d37dba0e86c583553e41f
2013-08-18 17:26:48 -07:00
Amith Yamasani
78b8265b17
Select max timeout, if it's in the timeout list
...
Bug: 10192592
Change-Id: I21ec208abf0c8659233cdb5219d9b226528aa1d4
2013-08-16 16:35:54 -07:00
Amith Yamasani
928191881d
Don't list apps that are disabled by the system
...
This is to make sure that apps that were disabled for some reason
such as inappropriateness for a locale or for a specific device, don't
show up as available to enable for a restricted profile.
But in the case that the app was already enabled for the target profile,
show it in the list so that it can be disabled if necessary.
Bug: 10229133
Change-Id: I3c19edb7364cea42d95b619781e0326543b9a1cf
2013-08-16 13:59:40 -07:00
Amith Yamasani
905c00a405
am 55fe056d
: Merge "Don\'t apply encryption password requirements for secondary users" into klp-dev
...
* commit '55fe056d96bdb683dce0a4e66e7390d19f23e710':
Don't apply encryption password requirements for secondary users
2013-08-15 18:09:06 -07:00
Amith Yamasani
55fe056d96
Merge "Don't apply encryption password requirements for secondary users" into klp-dev
2013-08-16 01:04:51 +00:00
Baligh Uddin
44a224cabf
am 239c79c8
: (-s ours) am a7238c18
: (-s ours) am dbf26e70
: (-s ours) Import translations. DO NOT MERGE
...
* commit '239c79c8d7f4b7c29c66f199eb7a5813b546ecb2':
Import translations. DO NOT MERGE
2013-08-15 17:57:48 -07:00
Baligh Uddin
239c79c8d7
am a7238c18
: (-s ours) am dbf26e70
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a7238c18b0b5a4500bc0b7a93ddcf4068d45fcd1':
Import translations. DO NOT MERGE
2013-08-15 17:54:13 -07:00
Baligh Uddin
e37538b122
am 8c6de9e0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8c6de9e052810aeec7a347bd015e7e8bf2c337cc':
Import translations. DO NOT MERGE
2013-08-15 17:48:11 -07:00
Baligh Uddin
a7238c18b0
am dbf26e70
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dbf26e70a1f546f9e198a72b2218ae99b015c9e6':
Import translations. DO NOT MERGE
2013-08-15 17:48:05 -07:00
Baligh Uddin
28132bfd3e
am eff5cd87
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'eff5cd87f1de04c06880774c8fd3e3b230c16503':
Import translations. DO NOT MERGE
2013-08-15 17:47:37 -07:00
Baligh Uddin
eff5cd87f1
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-16 00:44:53 +00:00
Zhihai Xu
97fb8dbbe8
am 3d74aeaa
: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
...
* commit '3d74aeaa85285425fc5f20cf93f615a4ead6d2fd':
LE: Add support for the HID-over-GATT profile (3/3)
2013-08-15 17:24:54 -07:00
Zhihai Xu
3d74aeaa85
Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
2013-08-16 00:22:33 +00:00
Lifu Tang
5c12d789f5
am c3e9ac93
: Linked the recent location apps to battery page
...
* commit 'c3e9ac937a4ba948d47cbb83f6999af34fd00b65':
Linked the recent location apps to battery page
2013-08-15 16:59:25 -07:00
Amith Yamasani
12411fba8e
Don't apply encryption password requirements for secondary users
...
Bug: 10314289
Change-Id: I54a54f910c914b41abd3e18963b4bd0c3cddb34a
2013-08-15 15:35:49 -07:00
Andre Eisenbach
79f3384eaa
LE: Add support for the HID-over-GATT profile (3/3)
...
bug:8330048
Change-Id: I0999c3af999939aec88eba4c38bca4358c554e69
2013-08-15 15:21:27 -07:00
Lifu Tang
c3e9ac937a
Linked the recent location apps to battery page
...
* Extracted BatteryStatsHelper from PowerUsageSummary
* Dropped the "pause" and "resume" method from the
RadioButtonPreference
* Opening battery usage page when the user clicks the recent location
apps item
Change-Id: I5a2d03271434765780154265976d8caa7f8060d8
2013-08-15 14:49:08 -07:00
Lifu Tang
adb9f2b992
am 5db411db
: Merge "Shows "App Info" for system apps" into klp-dev
...
* commit '5db411db9881ea9ec48f2a607b711d8daa74d1ca':
Shows "App Info" for system apps
2013-08-15 12:17:03 -07:00
Lifu Tang
5db411db98
Merge "Shows "App Info" for system apps" into klp-dev
2013-08-15 19:13:42 +00:00
Robert Greenwalt
9e96c453fb
am a1fa7cef
: am 1faefa06
: Merge "Fix one NPE in tethering setting"
...
* commit 'a1fa7cef5d88d0f515efa07d0f7274c41fa6d712':
Fix one NPE in tethering setting
2013-08-15 07:19:36 -07:00
Robert Greenwalt
a1fa7cef5d
am 1faefa06
: Merge "Fix one NPE in tethering setting"
...
* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
Fix one NPE in tethering setting
2013-08-15 07:17:11 -07:00
Robert Greenwalt
1faefa06a3
Merge "Fix one NPE in tethering setting"
2013-08-15 14:13:10 +00:00
Jianzheng Zhou
508c7c16ab
Fix one NPE in tethering setting
...
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.
Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com >
2013-08-15 14:34:52 +08:00
Lifu Tang
5d4e69a527
Shows "App Info" for system apps
...
If a specific Uid contains only one package, we show the "App Info"
button, even if it's a system app
Change-Id: Ie39b6d90e62ae432c636d50729f0aa45405ce67c
2013-08-14 17:25:12 -07:00
Baligh Uddin
3c8c3f9b00
Import translations. DO NOT MERGE
...
Change-Id: I3504c607a35636c6e0455571e9e7006244564b95
Auto-generated-cl: translation import
2013-08-14 14:46:29 -07:00
Baligh Uddin
dbf26e70a1
Import translations. DO NOT MERGE
...
Change-Id: I9d761d078fd6bc6a07998e3e439242eab9ea0c14
Auto-generated-cl: translation import
2013-08-14 14:44:15 -07:00
Baligh Uddin
8c6de9e052
Import translations. DO NOT MERGE
...
Change-Id: Ia45a89a6f426413ccca221aba0d34e597cdb4ec7
Auto-generated-cl: translation import
2013-08-14 14:42:52 -07:00
The Android Open Source Project
c4cdd59e02
Reconcile with klp-release - do not merge
...
Change-Id: Ibab39b9c65854cd80f8b125eace08eea87fb4a95
2013-08-14 14:25:51 -07:00
Martijn Coenen
9995bcbc82
am fcfd865d
: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
...
* commit 'fcfd865d5c1f2e20952d64196922840a63e83411':
NFC: Allow to get result from tap-pay default dialog.
2013-08-14 09:00:01 -07:00
Martijn Coenen
fcfd865d5c
Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
2013-08-14 15:58:07 +00:00
Martijn Coenen
e0a38911a3
NFC: Allow to get result from tap-pay default dialog.
...
Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
2013-08-14 08:57:11 -07:00
The Android Automerger
278640ca83
merge in klp-release history after reset to klp-dev
2013-08-14 06:06:53 -07:00
Tom O'Neill
0574c26c36
am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
Settings app supports location settings injection
2013-08-13 17:34:20 -07:00
Tom O'Neill
cabe7e8218
Merge "Settings app supports location settings injection" into klp-dev
2013-08-14 00:30:30 +00:00
Maggie Benthall
d0e9f6ada3
Fix bug when sharing to bluetooth.
...
Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
2013-08-13 13:29:45 -07:00
Przemyslaw Szczepaniak
72f078a310
Fix for TTS settings crash.
...
Play an example is wrongly enabled before TTS engine is initialized.
Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
2013-08-13 13:29:35 -07:00
Maggie Benthall
fa6faf95bc
am cd3eb97c
: Merge "Fix bug when sharing to bluetooth." into klp-dev
...
* commit 'cd3eb97ce57e9811cb7129d4d493a08480e9a56e':
Fix bug when sharing to bluetooth.
2013-08-13 10:04:09 -07:00
Maggie Benthall
cd3eb97ce5
Merge "Fix bug when sharing to bluetooth." into klp-dev
2013-08-13 17:00:25 +00:00
Przemyslaw Szczepaniak
d92af47f93
am 0e01f128
: Fix for TTS settings crash.
...
* commit '0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
Fix for TTS settings crash.
2013-08-13 06:43:09 -07:00
The Android Automerger
d4434eae68
merge in klp-release history after reset to klp-dev
2013-08-13 06:04:16 -07:00
Przemyslaw Szczepaniak
0e01f128ab
Fix for TTS settings crash.
...
Play an example is wrongly enabled before TTS engine is initialized.
Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
2013-08-13 13:05:48 +01:00
Baligh Uddin
3b3a8b0972
am 0782e629
: (-s ours) am 508997ad
: (-s ours) am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0782e6293bec6f51e5ecd23525f945823e5b4632':
Import translations. DO NOT MERGE
2013-08-13 00:53:52 -07:00
Baligh Uddin
0782e6293b
am 508997ad
: (-s ours) am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '508997ad0729e16eb04c475f9be3e33ca5ed60cf':
Import translations. DO NOT MERGE
2013-08-13 00:48:30 -07:00
Baligh Uddin
965d756920
am fff94ce8
: (-s ours) am 08f1d439
: (-s ours) am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fff94ce8cc24861de614bedb193e926e62179e04':
Import translations. DO NOT MERGE
2013-08-13 00:47:21 -07:00
Baligh Uddin
508997ad07
am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '728da4558087e5b3fe25fad7eedb4f5de5c4068f':
Import translations. DO NOT MERGE
2013-08-13 00:45:32 -07:00
Baligh Uddin
fff94ce8cc
am 08f1d439
: (-s ours) am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit '08f1d439c7a278b0cd9afd60f2ba41e846f40543':
Import translations. DO NOT MERGE
2013-08-13 00:44:04 -07:00
Baligh Uddin
b142c9462f
am a45cd5a6
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a45cd5a60ef71e70c4d4530370f46766d517541a':
Import translations. DO NOT MERGE
2013-08-13 00:43:55 -07:00
Baligh Uddin
728da45580
am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
Import translations. DO NOT MERGE
2013-08-13 00:42:15 -07:00
Baligh Uddin
08f1d439c7
am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit '054041058f9706c95b3d72ca421fcb656ad59d1e':
Import translations. DO NOT MERGE
2013-08-13 00:42:11 -07:00