OSDN Git Service
Amit Mahajan [Fri, 4 Sep 2015 02:21:31 +0000 (02:21 +0000)]
am
ff751bed: am
2f142ab0: am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
ff751bed7ce737d95db2edc79ffe2f34c0259a27':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Sharvil Nanavati [Fri, 4 Sep 2015 02:21:21 +0000 (02:21 +0000)]
am
80770c09: am
16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev
* commit '
80770c099144b65e9c7768bbdb56608eebf03b01':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
Amit Mahajan [Thu, 3 Sep 2015 21:50:00 +0000 (21:50 +0000)]
am
2f142ab0: am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
2f142ab0779c9e36c6f733d7e2e0be083f7172ac':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Amit Mahajan [Thu, 3 Sep 2015 21:39:52 +0000 (21:39 +0000)]
am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
8a670f1da434c4720b08dbb62c635316e593b9b3':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Amit Mahajan [Thu, 3 Sep 2015 21:24:46 +0000 (21:24 +0000)]
Merge changes from topic 'TDSCDMA support' into mnc-dr-dev
* changes:
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Sharvil Nanavati [Thu, 3 Sep 2015 21:12:33 +0000 (21:12 +0000)]
am
16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev
* commit '
16db4101829c7beee42a09fcaf87fa4e31bc1d5a':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
Sharvil Nanavati [Thu, 3 Sep 2015 21:02:43 +0000 (21:02 +0000)]
Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev
Adrian Roos [Thu, 3 Sep 2015 20:07:30 +0000 (20:07 +0000)]
am
6bd2f87e: am
bd2ad550: am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
6bd2f87ee4eac554646c5b04c44b6e3402bac84e':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 20:07:25 +0000 (20:07 +0000)]
am
95179ad4: am
54ceea19: am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
95179ad4be0377dd9fd35818145f705bcded0d28':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:58:08 +0000 (19:58 +0000)]
am
bd2ad550: am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
bd2ad550c5a7c7b7efbe3510f212322fb173b06c':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 19:57:58 +0000 (19:57 +0000)]
am
54ceea19: am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:46:45 +0000 (19:46 +0000)]
am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
34411e8fecab310a0402bd77e8fe5a5a488a783a':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 19:46:41 +0000 (19:46 +0000)]
am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
95200e6f4eb34818ac0b652167cffacfcfb4fdff':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:42:39 +0000 (19:42 +0000)]
Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev
Adrian Roos [Thu, 3 Sep 2015 19:41:22 +0000 (19:41 +0000)]
Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
Adrian Roos [Wed, 2 Sep 2015 20:23:30 +0000 (13:23 -0700)]
Don't disable fingerprint when entering wrong credential
Bug:
23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
Adrian Roos [Wed, 2 Sep 2015 20:26:25 +0000 (13:26 -0700)]
Poke fingerprint timeout when vold password is correct
Bug:
23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
Adrian Roos [Thu, 3 Sep 2015 19:29:42 +0000 (19:29 +0000)]
am
4eb81345: am
b90f1de2: am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
4eb81345da21efc2b9731cb1969704081064690c':
Show face unlock even when fingerprint is running
Adrian Roos [Thu, 3 Sep 2015 19:17:36 +0000 (19:17 +0000)]
am
b90f1de2: am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
b90f1de216ec8be27eebd17b5f3c6a87ee084e75':
Show face unlock even when fingerprint is running
Adrian Roos [Thu, 3 Sep 2015 19:08:53 +0000 (19:08 +0000)]
am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
1b5cc3a4ba46029b798adb9e362d87df5673bc52':
Show face unlock even when fingerprint is running
Adrian Roos [Thu, 3 Sep 2015 18:59:37 +0000 (18:59 +0000)]
Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
Ian Pedowitz [Thu, 3 Sep 2015 18:42:49 +0000 (18:42 +0000)]
am
1635e818: am
cb92577a: am
7d223aee: am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
1635e8182ad51c1085e608dea6d9ef470747f759':
Don't crash on (invalid) hardware address lengths > 127.
Svetoslav Ganov [Thu, 3 Sep 2015 18:42:44 +0000 (18:42 +0000)]
am
8fddbc44: am
a5cd5d87: am
0b5162c8: am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
8fddbc44b0f97b88839fb438d2b96b348547da96':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 18:42:38 +0000 (18:42 +0000)]
am
68025995: am
1942f8a7: am
d4ef34ce: am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
68025995632d2f4dc8e3fd9e7d518868c72d9e82':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Ian Pedowitz [Thu, 3 Sep 2015 18:31:12 +0000 (18:31 +0000)]
am
cb92577a: am
7d223aee: am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
cb92577aa6201abbba2d2f17c8cc8d99d9754e8b':
Don't crash on (invalid) hardware address lengths > 127.
Svetoslav Ganov [Thu, 3 Sep 2015 18:31:06 +0000 (18:31 +0000)]
am
a5cd5d87: am
0b5162c8: am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
a5cd5d8756bbaa62f965489f6fe9cd52e3fd17eb':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 18:31:00 +0000 (18:31 +0000)]
am
1942f8a7: am
d4ef34ce: am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
1942f8a72dbbd6e436c4744bdfa8c79a7d6aae4d':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Ian Pedowitz [Thu, 3 Sep 2015 18:14:49 +0000 (18:14 +0000)]
am
7d223aee: am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
7d223aeef8c9108210e0d13e9458b4d701781ee0':
Don't crash on (invalid) hardware address lengths > 127.
Svetoslav Ganov [Thu, 3 Sep 2015 18:14:17 +0000 (18:14 +0000)]
am
0b5162c8: am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
0b5162c85f01f8451120e7ad82aa7193850862f7':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 18:14:13 +0000 (18:14 +0000)]
am
d4ef34ce: am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
d4ef34ce8d9cfb351e1a063ce2ff354ee0b9c13b':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Ian Pedowitz [Thu, 3 Sep 2015 17:34:50 +0000 (17:34 +0000)]
am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
0a76afb93e6f303921ab84e2f26747c3ebf19b62':
Don't crash on (invalid) hardware address lengths > 127.
Ian Pedowitz [Thu, 3 Sep 2015 17:22:21 +0000 (17:22 +0000)]
Merge "Don't crash on (invalid) hardware address lengths > 127." into mnc-dev
Svetoslav Ganov [Thu, 3 Sep 2015 17:17:46 +0000 (17:17 +0000)]
am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
6dd856b1ea31bae083b6c2ed40af812c41b3a6cf':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 17:17:42 +0000 (17:17 +0000)]
am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
512141d581133ad5c1712ac097dcee08d46bae2c':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Svetoslav Ganov [Thu, 3 Sep 2015 17:08:57 +0000 (17:08 +0000)]
Merge "Don't drop runtime permissions on older system app update." into mnc-dev
Wale Ogunwale [Thu, 3 Sep 2015 17:06:03 +0000 (17:06 +0000)]
Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
Michael Wright [Thu, 3 Sep 2015 14:30:27 +0000 (14:30 +0000)]
am
87e4c951: am
59c1a0e1: am
8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '
87e4c951bf876faefad9f4223f6a568777425ae7':
Add TabletModeChangedListener for SystemUI.
Michael Wright [Thu, 3 Sep 2015 14:20:44 +0000 (14:20 +0000)]
am
59c1a0e1: am
8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '
59c1a0e1cb6cad46e30821e25f99c1ecce1227f0':
Add TabletModeChangedListener for SystemUI.
Michael Wright [Thu, 3 Sep 2015 14:10:05 +0000 (14:10 +0000)]
am
8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '
8ae90587a510f72a176119b1f23add8bc36285b9':
Add TabletModeChangedListener for SystemUI.
Michael Wright [Thu, 3 Sep 2015 14:00:52 +0000 (14:00 +0000)]
Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
Lorenzo Colitti [Thu, 3 Sep 2015 08:36:20 +0000 (17:36 +0900)]
Don't crash on (invalid) hardware address lengths > 127.
These would cause us to crash with a NegativeArraySizeException
when trying to create the clientMac array. Instead, if the length
is > 16 (invalid, because the field is only 16 bytes long), fudge
it to 6 (Ethernet / wifi). This is a bit less liberal than the
legacy client, which doesn't check the length at all.
Bug:
23725795
Change-Id: I83f47bfc400ffa8ce85dd9d1b8eb96be5afe51a5
Jim Miller [Thu, 3 Sep 2015 06:23:31 +0000 (06:23 +0000)]
am
ac1da481: am
f873f9ab: am
bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
* commit '
ac1da4816b360028eb0185ac984f1ffaa79fdb18':
Fingerprint should throttle after 5 attempts
Daniel Estrada Alva [Thu, 3 Sep 2015 06:23:25 +0000 (06:23 +0000)]
am
7f15432f: am
1afe952c: am
90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev
* commit '
7f15432fd05e98625bdf6f7ab1bea10491dde655':
Use private action for SUPL related connectivity changes.
Daniel Estrada Alva [Thu, 3 Sep 2015 06:23:10 +0000 (06:23 +0000)]
am
280b4495: am
967c8816: am
cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev
* commit '
280b4495bd492f68e955ea8e1649abe832ced974':
Add SUPL-specific network bcast
Christopher Tate [Thu, 3 Sep 2015 06:23:05 +0000 (06:23 +0000)]
am
a91d4357: am
623def69: am
7bae31f8: am
60aae166: Apply default link-handling policy at OTA from pre-M
* commit '
a91d4357c5da515b3901eb5f49f9fd5ed1c7ee8f':
Apply default link-handling policy at OTA from pre-M
Jorim Jaggi [Thu, 3 Sep 2015 06:22:48 +0000 (06:22 +0000)]
am
b991034d: am
ac2b543b: am
304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev
* commit '
b991034d3e45276f03f719ba24c98daf65870407':
Fix wrong mode for fingerprint unlock when bouncer not showing
Joe LaPenna [Thu, 3 Sep 2015 06:22:30 +0000 (06:22 +0000)]
am
bef95e93: (-s ours) am
93e66738: (-s ours) Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
* commit '
bef95e93306dc0325218cf880404ffa4f885afe4':
Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
Joe LaPenna [Thu, 3 Sep 2015 06:22:24 +0000 (06:22 +0000)]
am
97db5d77: am
23d681bb: Device Idle: Android wear support
* commit '
97db5d77fa249c12d026b36fe73682ea84a593d7':
Device Idle: Android wear support
Tim Kilbourn [Thu, 3 Sep 2015 06:22:06 +0000 (06:22 +0000)]
am
573cdc42: am
38ae1196: am
7cd6aaaf: am
ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit '
573cdc420b2d7f8d4636a949458a59f1937d62d1':
Allow shell to disable keyguard when not secure
Clara Bayarri [Thu, 3 Sep 2015 06:21:25 +0000 (06:21 +0000)]
am
9b126882: am
01232c50: am
582b186c: am
f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
* commit '
9b126882e61f2a1c3b0d1876c2bea3b38bbbafed':
Fix Custom action mode menu item onclick is not working
Vineeta Srivastava [Thu, 3 Sep 2015 06:21:18 +0000 (06:21 +0000)]
am
9051eab5: am
9edfb36a: am
dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev
* commit '
9051eab5a0d17b65362c6b8ba6095b581cf2a1c8':
set config_use_sim_language_file false for KR LGU+/KT
Joshua Schwarz [Thu, 3 Sep 2015 06:21:11 +0000 (06:21 +0000)]
am
bade9522: am
258a7cd9: Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev
* commit '
bade9522cf11141d3bd31ab9d56976a33d05fc64':
Use LOCAL_MAC_ADDRESS permission in bluetoothtests.
Roshan Pius [Thu, 3 Sep 2015 06:20:53 +0000 (06:20 +0000)]
am
c4809bcf: am
8750f04a: am
a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev
* commit '
c4809bcfa72f2f4eb4f03cb4b86dbb864cc01147':
Reformat only KR numbers with leading "+82".
Selim Cinek [Thu, 3 Sep 2015 04:24:09 +0000 (04:24 +0000)]
am
4997cd36: am
9e30e202: am
2af5010a: am
36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev
* commit '
4997cd364deeeb03edfe19e9c3959bd694970ec7':
Fixed a crash in the notification group manager
Deepanshu Gupta [Thu, 3 Sep 2015 04:24:04 +0000 (04:24 +0000)]
am
ee1eed7e: am
7209945f: am
0e150a8b: am
0c5fd7e3: am
eb541727: am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
ee1eed7e711228008dc91a7da800be6527539e87':
LayoutLib: Fix typedArray caching.
Jim Miller [Thu, 3 Sep 2015 04:23:55 +0000 (04:23 +0000)]
am
a32bef01: am
4f7d5dcd: am
be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev
* commit '
a32bef01a2f2ee2448ceefe465cd380e389771ad':
Only allow foreground app and keyguard to access FingerprintManager
Filip Gruszczynski [Thu, 3 Sep 2015 04:23:40 +0000 (04:23 +0000)]
am
521ded6e: am
dbf8c0d9: am
991e4936: am
cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev
* commit '
521ded6e9dcb9e97843c89f6d7c87264107d4ef7':
Don't perform layout while adjusting displays/stacks state.
Eino-Ville Talvala [Thu, 3 Sep 2015 04:23:35 +0000 (04:23 +0000)]
am
cb41a60e: am
7f2b4b6a: am
7e28b3bc: am
f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '
cb41a60ee259ee332eb11e2208c3ae5582ec5aec':
DO NOT MERGE: Fix DngCreator default crop calculations.
Selim Cinek [Thu, 3 Sep 2015 04:23:28 +0000 (04:23 +0000)]
am
260ae8e5: am
3e64c75f: am
146dc265: am
9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev
* commit '
260ae8e56c6c3f6acd9290a843f6cfe27cdad6a7':
Fixed when the notification effects are being cleared
Jim Miller [Thu, 3 Sep 2015 04:23:13 +0000 (04:23 +0000)]
am
444f8d2d: am
d050cc87: am
e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
* commit '
444f8d2d37144a3cb3966b3ca9118a7242c094e7':
Fix broken enter key after failed PIN attempts.
Vineeta Srivastava [Thu, 3 Sep 2015 04:23:07 +0000 (04:23 +0000)]
am
971f899a: am
53c14ce4: am
860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev
* commit '
971f899ab0ef939bce126ca26d7489799fe4edf8':
Do not show roaming icon for NL KPN network with Telfort SIM
Svetoslav [Thu, 3 Sep 2015 04:22:57 +0000 (04:22 +0000)]
am
42e3c369: am
dc436aaa: am
69228600: am
fb9ec507: Incorrect app op check in broadcast queue
* commit '
42e3c3696d7c5a6ee6ec4c9fd37289d6e917577a':
Incorrect app op check in broadcast queue
Tim Murray [Thu, 3 Sep 2015 04:22:36 +0000 (04:22 +0000)]
am
e2565aec: am
e20eff91: am
3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev
* commit '
e2565aecca1c56dcf80bb0e88dfddeca25388ad6':
Enable migration to big cores for app launches.
Christopher Wiley [Thu, 3 Sep 2015 00:39:29 +0000 (00:39 +0000)]
am
80a679c4: am
b1db04f3: Merge "aidl: Add end to end test"
* commit '
80a679c459d509e31f0f4e1b8accc327a451e0f5':
aidl: Add end to end test
Christopher Wiley [Thu, 3 Sep 2015 00:39:22 +0000 (00:39 +0000)]
am
a3b4fb68: am
b14e7b84: Merge "aidl: Remove example test"
* commit '
a3b4fb6851dc91222863783b7ac6664d62df2c3d':
aidl: Remove example test
Christopher Wiley [Thu, 3 Sep 2015 00:31:52 +0000 (00:31 +0000)]
am
b1db04f3: Merge "aidl: Add end to end test"
* commit '
b1db04f371963cb61bc5df21142a59f77515a62f':
aidl: Add end to end test
Christopher Wiley [Thu, 3 Sep 2015 00:31:45 +0000 (00:31 +0000)]
am
b14e7b84: Merge "aidl: Remove example test"
* commit '
b14e7b84290fa40221e3f315862dd1f79bf21871':
aidl: Remove example test
Jim Miller [Wed, 2 Sep 2015 23:29:07 +0000 (23:29 +0000)]
am
f873f9ab: am
bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
* commit '
f873f9ab6e2f59ebedbc1542ad780040e539f867':
Fingerprint should throttle after 5 attempts
Adrian Roos [Wed, 2 Sep 2015 20:29:42 +0000 (13:29 -0700)]
Show face unlock even when fingerprint is running
Bug:
23318158
Change-Id: I02b085297c2546c814d97d725d18beba79568b33
Casey Dahlin [Wed, 2 Sep 2015 23:20:40 +0000 (23:20 +0000)]
am
b15623cf: resolved conflicts for merge of
9483748a to stage-aosp-master
* commit '
b15623cf1c63d33fdd60c6046312c88cda961eb6':
Delete outdated options tests
Jim Miller [Wed, 2 Sep 2015 23:19:26 +0000 (23:19 +0000)]
am
bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
* commit '
bd5b61c489fb0543c8db29030e57189c273010eb':
Fingerprint should throttle after 5 attempts
Jim Miller [Wed, 2 Sep 2015 23:07:58 +0000 (23:07 +0000)]
Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
Jim Miller [Wed, 2 Sep 2015 22:35:33 +0000 (15:35 -0700)]
Fingerprint should throttle after 5 attempts
Fixes bug
23762058
Change-Id: I62665dd3097b8e71075a5eddbf34a551db1507d5
Daniel Estrada Alva [Wed, 2 Sep 2015 22:19:22 +0000 (22:19 +0000)]
am
1afe952c: am
90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev
* commit '
1afe952ca1964a43d8a1ec3dd69a8ee1b85dba17':
Use private action for SUPL related connectivity changes.
Daniel Estrada Alva [Wed, 2 Sep 2015 22:13:10 +0000 (22:13 +0000)]
am
90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev
* commit '
90738c2a7e85cd07ac2cf3ab61246b7745c8fb80':
Use private action for SUPL related connectivity changes.
Daniel Estrada Alva [Wed, 2 Sep 2015 22:04:30 +0000 (22:04 +0000)]
Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev
Wale Ogunwale [Wed, 2 Sep 2015 21:53:29 +0000 (14:53 -0700)]
Respect DONT_KILL_APP flag when bringing down a disabled service.
Commit
540e123 introduce logic to clean up states when a component is
disabled. For services this included marking the process running the
service as removed so it can be killed later. However, this wasn't
respecting the Intent.EXTRA_DONT_KILL_APP flag where the caller
doesn't want the process of the disabled component to be killed.
This change now takes the flag into account.
Bug:
23491822
Bug:
15804187
Change-Id: I54a6e03cd66164dc8c4606a3c462114fe661ea8e
Casey Dahlin [Wed, 2 Sep 2015 21:33:41 +0000 (14:33 -0700)]
resolved conflicts for merge of
9483748a to stage-aosp-master
Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d
Daniel Estrada Alva [Wed, 2 Sep 2015 21:30:37 +0000 (21:30 +0000)]
am
967c8816: am
cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev
* commit '
967c8816e5b32033331deca294708cd3e467c3f2':
Add SUPL-specific network bcast
Christopher Tate [Wed, 2 Sep 2015 21:30:32 +0000 (21:30 +0000)]
am
623def69: am
7bae31f8: am
60aae166: Apply default link-handling policy at OTA from pre-M
* commit '
623def69ef11f95973d93e6dbc2624e814a3adf3':
Apply default link-handling policy at OTA from pre-M
Casey Dahlin [Wed, 2 Sep 2015 21:29:59 +0000 (21:29 +0000)]
am
bad130ee: am
02bc5488: Merge "Remove RPC interface Type"
* commit '
bad130eed378891b82250d90aaf207088b4362e2':
Remove RPC interface Type
Casey Dahlin [Wed, 2 Sep 2015 21:18:46 +0000 (21:18 +0000)]
am
02bc5488: Merge "Remove RPC interface Type"
* commit '
02bc5488c19dcae7f21c43c8f3a20138e01a04d9':
Remove RPC interface Type
Daniel Estrada Alva [Wed, 2 Sep 2015 21:11:38 +0000 (21:11 +0000)]
am
cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev
* commit '
cfd45ae4718934d403a17410ab6a7c722bdd01fc':
Add SUPL-specific network bcast
Christopher Tate [Wed, 2 Sep 2015 21:11:34 +0000 (21:11 +0000)]
am
7bae31f8: am
60aae166: Apply default link-handling policy at OTA from pre-M
* commit '
7bae31f88f8dcaf8114d9d43b29e154bc23374ad':
Apply default link-handling policy at OTA from pre-M
Christopher Wiley [Wed, 2 Sep 2015 21:10:30 +0000 (21:10 +0000)]
Merge "aidl: Add end to end test"
Christopher Wiley [Wed, 2 Sep 2015 21:10:09 +0000 (21:10 +0000)]
Merge "aidl: Remove example test"
Daniel Estrada Alva [Wed, 2 Sep 2015 21:04:19 +0000 (21:04 +0000)]
Merge "Add SUPL-specific network bcast" into mnc-dr-dev
Jorim Jaggi [Wed, 2 Sep 2015 21:03:55 +0000 (21:03 +0000)]
am
ac2b543b: am
304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev
* commit '
ac2b543be64a2ef83d37f749d2786f85d910bd13':
Fix wrong mode for fingerprint unlock when bouncer not showing
Casey Dahlin [Wed, 2 Sep 2015 21:02:02 +0000 (21:02 +0000)]
Merge "Delete outdated options tests"
Casey Dahlin [Wed, 2 Sep 2015 21:01:33 +0000 (21:01 +0000)]
Merge "Remove RPC interface Type"
Christopher Tate [Wed, 2 Sep 2015 20:57:28 +0000 (20:57 +0000)]
am
60aae166: Apply default link-handling policy at OTA from pre-M
* commit '
60aae166e99dff0dba379e14c0fc43e89fd1a018':
Apply default link-handling policy at OTA from pre-M
Jorim Jaggi [Wed, 2 Sep 2015 20:54:42 +0000 (20:54 +0000)]
am
304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev
* commit '
304e3772273cd39ae55fbdc1c453d8fa50258670':
Fix wrong mode for fingerprint unlock when bouncer not showing
Svetoslav [Wed, 2 Sep 2015 20:53:05 +0000 (13:53 -0700)]
Don't drop runtime permissions on older system app update.
We have a device with an installed version of an app that is not
preinstalled and has some runtime permissions granted. Now we get
OTA with an older version of the app which does not request these
runtime permissions. We first scan system packages and then installed
apps. During the scan we encounter the newly appeared system package
and determine it is older than the one we have installed and disable
it.
However, before we disable the package we update the permissions
for this package but since the one on the system partition (the one
we found so far) doesn't request some of the runtime permissions
granted to the installed version of the app, they get dropped on the
floor. This grant attempt is not necessary as the permission the
installed package has depends entirely on the permissions it requests.
In this process we may look at the requested permissions on the
disabled system package but in general the updated package cannot
have a permission that it does not request regardless whether the
disabled system app requests it or on.
bug:
23718806
Change-Id: I187bc11750eb270c3233c314992186f5d58d9d82
Jorim Jaggi [Wed, 2 Sep 2015 20:43:04 +0000 (20:43 +0000)]
Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev
Casey Dahlin [Wed, 2 Sep 2015 18:02:11 +0000 (11:02 -0700)]
Delete outdated options tests
Bug:
23718807
Test: Re-ran make. Confirmed code was not linked.
Change-Id: If065b9287ed70b9e380281cae42f89bd5f1ffb06
Signed-off-by: Casey Dahlin <sadmac@google.com>
Casey Dahlin [Tue, 1 Sep 2015 20:21:26 +0000 (13:21 -0700)]
Remove RPC interface Type
AIDL previously supported "rpc" and "flatten" types, which are not used
anywhere in the Android tree. This patch removes them, which significantly cuts
down code and complexity.
Bug:
23517584
Test: Rebuilt AOSP tree against new version
Change-Id: I6cf38d43c1ce109ffca987cc14520945aa22431f
Signed-off-by: Casey Dahlin <sadmac@google.com>
Christopher Tate [Wed, 2 Sep 2015 19:54:41 +0000 (12:54 -0700)]
Apply default link-handling policy at OTA from pre-M
Not just at first (wiped) boot.
Bug
23744303
Change-Id: I9ab42f7b081e92231d89b3c97935135c3dd901d4
Christopher Wiley [Tue, 1 Sep 2015 00:36:41 +0000 (17:36 -0700)]
aidl: Add end to end test
This test sets up an artificial hierarchy of .aidl files, then
checks that the generated code contains a substring that we
know to be correct. This isn't a very good unittest, but it does
validate that the whole flow works start to finish.
Bug:
23516947
Test: compiles, unit tests pass.
Change-Id: I931b7659731b05440040623e12596669604cef3a
Christopher Wiley [Wed, 2 Sep 2015 19:49:52 +0000 (12:49 -0700)]
aidl: Remove example test
We have enough tests demonstrating how to write them.
Bug:
23516947
Change-Id: I966cb6bb2d754db389be8f9b90957ac33cf66639
Test: Unittests pass.
Joe LaPenna [Wed, 2 Sep 2015 19:42:22 +0000 (19:42 +0000)]
am
93e66738: (-s ours) Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
* commit '
93e6673856a0b851ca5074ae11e6f0635fb3eba9':
Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE