Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247,288 Commits 3 Branches 0 Tags
d444ff120774ef87710ee3106534ea7ca44baa5d
Commit Graph

247288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mahaver Chopra
d444ff1207 Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem 
Bug:29409746
Change-Id: I5254456cc2364c93809cebbe2d134a873873790d
 2016-06-16 14:42:52 +01:00
Ricky Wai
18c57b5cd5 Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev 
am: 43f6a45e7e

Change-Id: If6535443baacec9fc1af2ed376c3ffa25f677103
 2016-06-16 10:39:03 +00:00
Ricky Wai
43f6a45e7e Merge "Add permission checking on service calls in LockSettingsService" into nyc-dev 2016-06-16 10:33:23 +00:00
Bill Yi
cf0bd1675c Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: d58da1be76  -s ours

Change-Id: I8f6a3c344ce19bf7dbdf3882e393627ed8029d46
 2016-06-16 10:26:32 +00:00
TreeHugger Robot
d58da1be76 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-16 10:21:19 +00:00
Robin Lee
c9ac672d85 Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev 
am: 3e343ffd91

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1
 2016-06-16 10:10:23 +00:00
Robin Lee
3e343ffd91 Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev 2016-06-16 10:06:11 +00:00
Android Build Merger (Role)
74ab23803c Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 65266b99d2 -s ours" into nyc-mr1-dev 2016-06-16 10:03:54 +00:00
TreeHugger Robot
c985571e5e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-16 10:03:45 +00:00
Bill Yi
7a8eb2cead Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: 65266b99d2  -s ours

Change-Id: I633386b991908081feeaaf100554c7c455980c13
 2016-06-16 10:03:28 +00:00
TreeHugger Robot
65266b99d2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-16 09:58:56 +00:00
TreeHugger Robot
5ed24ad6c3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-16 09:57:55 +00:00
Bill Yi
1b96933ce3 Import translations. DO NOT MERGE 
Change-Id: I9447404228057a1b952d1ac04f1b1df4d73568b9
Auto-generated-cl: translation import
 2016-06-16 01:48:06 -07:00
Bill Yi
ec038aa44a Import translations. DO NOT MERGE 
Change-Id: I8186498fb657aa424eeb74f965fa44f7a053f65c
Auto-generated-cl: translation import
 2016-06-16 01:42:16 -07:00
Bill Yi
30d661c934 Import translations. DO NOT MERGE 
Change-Id: I5d0d4f9c0cc63d726daf44da8cb5f1b11dca276f
Auto-generated-cl: translation import
 2016-06-15 22:10:07 -07:00
Bill Yi
ea1edaca72 Import translations. DO NOT MERGE 
Change-Id: I3e3e3acf4c81fea5831768ccb73a313d16bab865
Auto-generated-cl: translation import
 2016-06-15 21:49:11 -07:00
Selim Cinek
447ee99755 Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev 
am: c1720dce1b

Change-Id: I14674254eb79fef58e4dcb1a8d7ecaab24831691
 2016-06-16 04:25:26 +00:00
TreeHugger Robot
c1720dce1b Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev 2016-06-16 04:19:48 +00:00
Ruben Brunk
c3e651cb52 Remove coarse location pre-grant for preinstalled VrListenerServices. 
am: d430f1a0be

Change-Id: I9501d2926246f5f83ef24a5105323d8e43807608
 2016-06-16 01:37:29 +00:00
Ruben Brunk
d430f1a0be Remove coarse location pre-grant for preinstalled VrListenerServices. 
Bug: 28919229
Change-Id: I97393308129c65ef2822014775d3e77e25dc21e6
 2016-06-15 17:55:41 -07:00
Ruben Brunk
fafe810a61 Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev 
am: 931a7c03e0

Change-Id: I70301a77d89271e74e69efb92f340f1dbf6b3ca8
 2016-06-16 00:34:32 +00:00
Mihai Nita
44080ac5bf Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev 
am: c8c9afeacb

Change-Id: Iaa4df1af4a18ad0bc4e99a5bd47aa8f6c1357e50
 2016-06-16 00:34:30 +00:00
Ruben Brunk
931a7c03e0 Merge "Fix VR transition for display on/off sequence." into nyc-dev 2016-06-16 00:29:32 +00:00
Mihai Niță
c8c9afeacb Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev 2016-06-16 00:28:37 +00:00
Ruben Brunk
af9f004f99 Fix VR transition for display on/off sequence. 
- Ensure VR transition has been applied before display power
  off sequence.

Bug: 29364940
Change-Id: I1224ac653d466919cb418e5c357a748606c4fd7d
 2016-06-15 17:24:35 -07:00
Amith Yamasani
c5ffdb9ee4 Merge \"More thorough cleansing of expired users\" into nyc-dev 
am: 4f2b1b455e

Change-Id: I5714f73a9b90c0cb8fee653abf799374acfc6232
 2016-06-16 00:24:14 +00:00
Amith Yamasani
4f2b1b455e Merge "More thorough cleansing of expired users" into nyc-dev 2016-06-16 00:14:59 +00:00
Mihai Nita
1711d430cb Fix for NullPointerException in SuggestedLocaleAdapter 
Bug: 28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69
 2016-06-15 17:07:10 -07:00
Selim Cinek
e9bad242f3 Added dismiss, expand, and collapse accessibility actions 
Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1
 2016-06-15 16:30:09 -07:00
Mady Mellor
337c714364 Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev 
am: 8363980d45

Change-Id: I99a748be4a74e917f7e17fdf7ad9a7c52d120a0b
 2016-06-15 23:27:39 +00:00
Mady Mellor
8363980d45 Merge "Fixes issue with group backgrounds when animating to keyguard" into nyc-dev 2016-06-15 23:20:24 +00:00
Bert McMeen
7716f3ffe7 Merge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into mnc-io-docs am: 9011149e19 am: 7250594f04 
am: 0caf0b7259

Change-Id: I34c4adf1e9c003ab24c9fa07f879927fd3db4332
 2016-06-15 23:13:27 +00:00
Bert McMeen
0caf0b7259 Merge \\"Docs: A removal from docs of an obsolete watch face permission\\" into mnc-io-docs am: 9011149e19 
am: 7250594f04

Change-Id: I486c9ee933a6ed64d90013cf9964e7106713dde8
 2016-06-15 23:08:28 +00:00
Bert McMeen
7250594f04 Merge \"Docs: A removal from docs of an obsolete watch face permission\" into mnc-io-docs 
am: 9011149e19

Change-Id: If34c51a5c2f8b28612c3526ca40cfce5a9a4a140
 2016-06-15 23:03:13 +00:00
Bert McMeen
9011149e19 Merge "Docs: A removal from docs of an obsolete watch face permission" into mnc-io-docs 2016-06-15 22:57:59 +00:00
Winson
43fb1f2ec7 Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev 
am: 9a75ed7ab5

Change-Id: I8dffa83fc2f3cb031062412171453dc7d19a2e66
 2016-06-15 22:57:09 +00:00
TreeHugger Robot
9a75ed7ab5 Merge "Fixing issue with screen pinning screen not showing for secondary users." into nyc-dev 2016-06-15 22:48:55 +00:00
Brad Ebinger
e93c91edc2 Merge \"Handle Concurrency issues in Connection\" into nyc-dev 
am: df41725e53

Change-Id: I0332df9dc96086a3094dc4ab53573b5cf57f8730
 2016-06-15 22:48:06 +00:00
Adam Lesinski
1dda5b39d4 Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev 
am: 464bda8a2b

Change-Id: I0609c73c4f36b48970bba83b6ea5bd95e6c2d956
 2016-06-15 22:47:58 +00:00
TreeHugger Robot
9b464f651b Merge "Move IMS-related protected broadcasts to packages/services/Telephony" into nyc-mr1-dev 2016-06-15 22:39:19 +00:00
Brad Ebinger
df41725e53 Merge "Handle Concurrency issues in Connection" into nyc-dev 2016-06-15 22:37:46 +00:00
Adam Lesinski
464bda8a2b Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev 2016-06-15 22:35:26 +00:00
Makoto Onuki
70a91541e9 Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev 2016-06-15 21:44:58 +00:00
Andrew Solovay
ca460ea167 Merge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev 
am: 8e8fb7dda0

Change-Id: I756b3d9c2118946c9f389e209682cf4a8b984aec
 2016-06-15 21:42:17 +00:00
TreeHugger Robot
8e8fb7dda0 Merge "docs: Added AfW item to DP4 "Behavior Changes" page" into nyc-dev 2016-06-15 21:36:05 +00:00
Brian Duddie
93a2410f2d Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev 
am: 9a31e8be48

Change-Id: Ied704de01ddc2b9754a5a2d88b7b9624d711dd11
 2016-06-15 21:28:52 +00:00
Makoto Onuki
9e1f5595bd ShortcutManger: Auto-adjust ranks. 
Spec: go/shortcutmanager-spec-ranks

Bug 28984376
Bug 28536066

Change-Id: Ibffb92233c62792af06eeadc5a9a6379d0506a3c
 2016-06-15 14:24:44 -07:00
Hall Liu
81ce5bc113 Merge "Add support for Telecom analytics extensions" into nyc-mr1-dev 2016-06-15 21:24:16 +00:00
Richard Ho
354c9ff3d5 Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev 
am: 07a375186e

Change-Id: Icd7c52967c634dbdbef55166523039f4004e4d9a
 2016-06-15 21:14:24 +00:00
TreeHugger Robot
9a31e8be48 Merge "Send VR mode notification to AR app on context hub" into nyc-dev 2016-06-15 21:09:33 +00:00