drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
218,669 Commits 1 Branch 0 Tags
Commit Graph

218669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Willemsen
f05de8f3b2 am cd72b8be: am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime" 
* commit 'cd72b8be4653841f34a8d757cf27b055f40105bd':
  Add exported include dir for libandroid_runtime
 2015-09-28 21:36:42 +00:00
Dan Willemsen
cd72b8be46 am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime" 
* commit 'f21beb12f95b311ae20f2b5058252eb386a8b7b8':
  Add exported include dir for libandroid_runtime
 2015-09-28 21:30:46 +00:00
Dan Willemsen
f21beb12f9 am 899110f3: Merge "Add exported include dir for libandroid_runtime" 
* commit '899110f3012eb9ab2056d8ee182d5bdab0ecae19':
  Add exported include dir for libandroid_runtime
 2015-09-28 21:23:57 +00:00
Dan Willemsen
899110f301 Merge "Add exported include dir for libandroid_runtime" 2015-09-28 21:14:42 +00:00
Filip Gruszczynski
f370a5b303 Merge "Resizing docked stack by dragging dock divider." 2015-09-28 21:05:12 +00:00
Jorim Jaggi
e3e6d56b94 Fix jank: Don't write lockout deadline if not needed 
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.

Bug: 24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
 2015-09-28 13:57:37 -07:00
Filip Gruszczynski
3ddc5d6096 Resizing docked stack by dragging dock divider. 
Change-Id: Icc9df00446780f8cd81df4654ace07f33346e901
 2015-09-28 13:26:33 -07:00
Alan Viverette
b854d07a1a Unhide PopupWindow.getMaxAvailableHeight(View, int, boolean) 
Bug: 24394572
Change-Id: If66fa0178ed0d8c8d78e286a8b928ad88d6e90fa
 2015-09-28 16:12:18 -04:00
Julia Reynolds
41da2f777f Merge "Allow signature apps to modify notification policies." 2015-09-28 19:21:28 +00:00
Julia Reynolds
6ee2617832 Allow signature apps to modify notification policies. 
Bug: 22977552
Change-Id: Ib2bc3a55a904011218bb3adb19998cc4a0b7e709
 2015-09-28 15:03:52 -04:00
Julia Reynolds
7581121ba5 Merge "Revert "Allow signature apps to modify notification policies."" 2015-09-28 18:55:41 +00:00
Julia Reynolds
3a0ee8f963 Revert "Allow signature apps to modify notification policies." 
This reverts commit 39a8c353a8f723e5e67bc846f8fa96d580c4abbb.

Change-Id: I9a9a5fcc76202f5d2b3b175e5d5b9361604285d8
 2015-09-28 18:55:28 +00:00
Julia Reynolds
b487ffeef7 Merge "Allow signature apps to modify notification policies." 2015-09-28 18:51:48 +00:00
Dimitry Ivanov
7642d56887 am 8571397a: am ef9e04b2: am 66f5affb: Merge "Fix bug number for linker related workarounds" 
* commit '8571397a0f99fd29b62e19219f1aa2d5b6894b9e':
  Fix bug number for linker related workarounds
 2015-09-28 18:50:28 +00:00
Julia Reynolds
39a8c353a8 Allow signature apps to modify notification policies. 
Bug: 22977552
Change-Id: I7bfd2fe7bcb2e14b9eb7281acbb8a35dbc2ec93e
 2015-09-28 14:48:42 -04:00
Todd Kennedy
6b78340f6c resolved conflicts for b4d41021 to master 
Change-Id: Ib413c588ffb7a2b4385d2088e6de782417625037
 2015-09-28 11:47:19 -07:00
Dimitry Ivanov
8571397a0f am ef9e04b2: am 66f5affb: Merge "Fix bug number for linker related workarounds" 
* commit 'ef9e04b21020fd9e0e4be804627dc96e44e3581c':
  Fix bug number for linker related workarounds
 2015-09-28 18:28:22 +00:00
Todd Kennedy
b4d41021b4 am 92b28f37: resolved conflicts for 4ed21bf0 to stage-aosp-master 
* commit '92b28f37de9956c172f779df4cf540abc5b94deb':
  Allow using the JIT
 2015-09-28 18:28:14 +00:00
Dimitry Ivanov
ef9e04b210 am 66f5affb: Merge "Fix bug number for linker related workarounds" 
* commit '66f5affbe41a49bedf35e73b7c7f482db6e2fa7b':
  Fix bug number for linker related workarounds
 2015-09-28 18:23:56 +00:00
Todd Kennedy
92b28f37de resolved conflicts for 4ed21bf0 to stage-aosp-master 
Change-Id: I9c8ab83589ee3786c884f34066c1f3d709dc5136
 2015-09-28 11:20:38 -07:00
Dimitry Ivanov
66f5affbe4 Merge "Fix bug number for linker related workarounds" 2015-09-28 18:07:40 +00:00
Fyodor Kupolov
dfc9ce5477 Merge "Added --restricted option for create-user command" 2015-09-28 18:00:40 +00:00
Adam Lesinski
a57a540440 Fix asymmetry in parceling/unparceling code for BatteryStats summary 
Bug:24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
 2015-09-28 10:59:45 -07:00
Billy Lau
b4a6d9847b am 337c069a: am 81451c1c: am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit '337c069ac897db69f239c1927ddaf9225a7a6fef':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:54:33 +00:00
Makoto Onuki
a047d2e550 Merge "Fix OwnersTest when run with -e package" 2015-09-28 17:53:16 +00:00
Todd Kennedy
4ed21bf038 Merge "Allow using the JIT" 2015-09-28 17:47:01 +00:00
Billy Lau
337c069ac8 am 81451c1c: am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit '81451c1c370c12d8d6125647e81e5ab5b67fab11':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:45:40 +00:00
Billy Lau
81451c1c37 am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit 'cb4bafb4c97dc5e73b055ae1c0e4a548068062cd':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:38:08 +00:00
Dmitriy Ivanov
ad1cf03e80 Fix bug number for linker related workarounds 
Bug: http:/b/24425865
Change-Id: Iba52acc99c8ff548ff875726988600ed230c988e
 2015-09-28 10:37:49 -07:00
Billy Lau
cb4bafb4c9 am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit '86e153d5f0614c9f3da137fd0b815a398598928b':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:31:48 +00:00
Jae Seo
14978597f2 am 42934e65: am 6fb2da65: Merge "docs: fix a wrong link" into mnc-ub-dev 
* commit '42934e65f5e8a6d16b43cc37c3fe2c6ad18a933a':
  docs: fix a wrong link
 2015-09-28 17:31:46 +00:00
Billy Lau
86e153d5f0 am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit 'f360bbca969f60ee968240d22bc0b1f1e5e17218':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:24:25 +00:00
Jae Seo
42934e65f5 am 6fb2da65: Merge "docs: fix a wrong link" into mnc-ub-dev 
* commit '6fb2da6506b43347b388f9d4e4327767790f237e':
  docs: fix a wrong link
 2015-09-28 17:23:48 +00:00
Billy Lau
f360bbca96 Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 2015-09-28 17:18:30 +00:00
Jae Seo
6fb2da6506 Merge "docs: fix a wrong link" into mnc-ub-dev 2015-09-28 17:17:00 +00:00
Fyodor Kupolov
02cb6e773b Added --restricted option for create-user command 
Also moved restricted profile create/setup logic from Settings to
UMS.createRestrictedProfile.

Bug: 24212155
Bug: 24303609
Change-Id: I0346a3368de53f4bb4b6e054349f19adac959d7f
 2015-09-28 10:01:54 -07:00
Alan Viverette
49c5c42411 Fix colorPrimary under Holo theme, remove unused colors 
Change-Id: Ibb0bc7de00c3b287e0b917b95ff0a53ddeaa9eee
 2015-09-28 12:55:28 -04:00
Yury Khmel
7e51911037 Merge "Jank test for full-screen activity orientation change." 2015-09-28 13:34:09 +00:00
Daichi Hirono
aeaa12c34e Merge "Add readEvent method to MtpDevice." 2015-09-28 12:40:05 +00:00
Adam Lesinski
f4a09907e9 am 983c6d4d: am b8126531: am d913782f: am d5f10154: Bump BatteryStats version 
* commit '983c6d4d39265346a088174482f1f0dc55c0ca31':
  Bump BatteryStats version
 2015-09-28 07:19:32 +00:00
Adam Lesinski
983c6d4d39 am b8126531: am d913782f: am d5f10154: Bump BatteryStats version 
* commit 'b8126531c4275b5caf0132930a2cfc14344c20ce':
  Bump BatteryStats version
 2015-09-28 07:12:49 +00:00
Adam Lesinski
b8126531c4 am d913782f: am d5f10154: Bump BatteryStats version 
* commit 'd913782f1b48e1ef5928f869279c541e023d1cb7':
  Bump BatteryStats version
 2015-09-28 07:06:55 +00:00
Adam Lesinski
d913782f1b am d5f10154: Bump BatteryStats version 
* commit 'd5f10154c772b925f6527e25aeb8461de8c710cd':
  Bump BatteryStats version
 2015-09-28 07:00:52 +00:00
Erik Kline
41480898f3 Add an explanation of how IpReachabilityMonitor works 
Change-Id: Idfc1cf64c867182ffd612b27ba463b97e6c95769
 2015-09-28 15:44:12 +09:00
Baligh Uddin
f9d0b444e9 am eee40898: (-s ours) am ab46a9ad: (-s ours) am a9abcc43: (-s ours) am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'eee40898a9d92bb1eda556ba874f051da2030e53':
  Import translations. DO NOT MERGE
 2015-09-27 23:34:03 +00:00
Baligh Uddin
e88d66b5a9 am 1e7304ba: (-s ours) am 4ecf83e9: (-s ours) am 4ac4ba5d: (-s ours) am 0307a2a6: (-s ours) Import translations. DO NOT MERGE 
* commit '1e7304ba03d910892971d7875cefc5e42daeb05b':
  Import translations. DO NOT MERGE
 2015-09-27 23:33:56 +00:00
Baligh Uddin
eee40898a9 am ab46a9ad: (-s ours) am a9abcc43: (-s ours) am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'ab46a9adf8b41d6b4c52d828131db531d456cc36':
  Import translations. DO NOT MERGE
 2015-09-27 23:23:49 +00:00
Baligh Uddin
1e7304ba03 am 4ecf83e9: (-s ours) am 4ac4ba5d: (-s ours) am 0307a2a6: (-s ours) Import translations. DO NOT MERGE 
* commit '4ecf83e99c50dbd1da6cada29e47ea5d1fffcfa2':
  Import translations. DO NOT MERGE
 2015-09-27 23:23:43 +00:00
Baligh Uddin
ab46a9adf8 am a9abcc43: (-s ours) am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'a9abcc43ae71b907e6944ec0710834ef56801145':
  Import translations. DO NOT MERGE
 2015-09-27 22:37:45 +00:00
Baligh Uddin
4ecf83e99c am 4ac4ba5d: (-s ours) am 0307a2a6: (-s ours) Import translations. DO NOT MERGE 
* commit '4ac4ba5d1295b31a759609fd1e495cbf5e18ea64':
  Import translations. DO NOT MERGE
 2015-09-27 22:37:39 +00:00