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

150838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
ad2d935763 am c931d0d8: am fcb42104: Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 
* commit 'c931d0d8540f7648d5bb247fa1b03e492363debb':
  AAPT: Fix regression generating dynamic ref table for shared libraries
 2014-08-21 17:48:33 +00:00
Adam Lesinski
c406bde7a1 am fcb42104: Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 
* commit 'fcb421041f01318f31df7a3574f3757d7caf63ef':
  AAPT: Fix regression generating dynamic ref table for shared libraries
 2014-08-21 17:40:23 +00:00
Winson Chung
1e1d243901 am 41e1107e: am d0f79c5c: Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev 
* commit '41e1107e115a9b7a27b9494fe7d4bef2e99d1686':
  Fixing issue with inconsistent icon filename. (Bug 16992882)
 2014-08-21 17:37:26 +00:00
Adam Lesinski
223ddaa74d Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 2014-08-21 17:31:46 +00:00
Andres Morales
d3a520b4cc am ea5ffd04: am 87eeebec: Merge "Remove old NFC unlock api" into lmp-dev 
* commit 'ea5ffd047f340224e4a8df97fc24f2d907b8ee46':
  Remove old NFC unlock api
 2014-08-21 17:27:31 +00:00
Paul Jensen
b4fa36e153 am 49e50b0a: am 4a5d418d: Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 
* commit '49e50b0a1200a281f954c33b288f51ee577d2852':
  Send captive portal broadcast as user CURRENT.
 2014-08-21 17:27:27 +00:00
Winson Chung
6e377516f0 am d0f79c5c: Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev 
* commit 'd0f79c5cef9d88e7c4273d4b96761c9871112260':
  Fixing issue with inconsistent icon filename. (Bug 16992882)
 2014-08-21 17:27:20 +00:00
Winson Chung
b91bd653c9 Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev 2014-08-21 17:19:28 +00:00
Andres Morales
b6acdfa283 am 87eeebec: Merge "Remove old NFC unlock api" into lmp-dev 
* commit '87eeebec63b132b62920201b60ec56ca4e8ac6b3':
  Remove old NFC unlock api
 2014-08-21 17:18:13 +00:00
Paul Jensen
6251784931 am 4a5d418d: Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 
* commit '4a5d418db29a3917f084e9b3da786c82510535f3':
  Send captive portal broadcast as user CURRENT.
 2014-08-21 17:18:08 +00:00
RoboErik
c926d5077a am 030b3b29: am 90863124: Merge "Set transport control flags when a session is created" into lmp-dev 
* commit '030b3b29c7189af1edb666bd3e0508500f0e4837':
  Set transport control flags when a session is created
 2014-08-21 17:17:29 +00:00
Dianne Hackborn
865bac56f5 am a7d4d7bc: am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit 'a7d4d7bcfa51aa6d556652141a34c497bb4132d0':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:17:24 +00:00
Andres Morales
6a12e77194 Merge "Remove old NFC unlock api" into lmp-dev 2014-08-21 17:07:32 +00:00
Paul Jensen
e16a24559f Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 2014-08-21 17:05:42 +00:00
RoboErik
abb19a71fd am 90863124: Merge "Set transport control flags when a session is created" into lmp-dev 
* commit '908631240c31ef482f7e9189822e803da1b22030':
  Set transport control flags when a session is created
 2014-08-21 17:05:04 +00:00
Dianne Hackborn
6f334b8964 am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit 'ee6e179e85c029573948830f37bbbddfea1e78a5':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:04:52 +00:00
Chris Craik
b1e59e8563 am 6ec6fe3a: am 7d271c37: Merge "Clarify text shadow attribute/method comments" into lmp-dev 
* commit '6ec6fe3ac2b003208e82848725896866a0945bcf':
  Clarify text shadow attribute/method comments
 2014-08-21 17:04:44 +00:00
RoboErik
69b131339b Merge "Set transport control flags when a session is created" into lmp-dev 2014-08-21 16:58:42 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Chris Craik
ab3f9dd4e7 am 7d271c37: Merge "Clarify text shadow attribute/method comments" into lmp-dev 
* commit '7d271c376159a6202b463930efd63d177351fd18':
  Clarify text shadow attribute/method comments
 2014-08-21 16:52:23 +00:00
Nicolas Prevot
b4c43c029e am 6815c529: am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '6815c5298b8b8658cec7eecb43117d7abfe4dd71':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:47:13 +00:00
Paul Lawrence
155b06c06e am d2566bdb: am c8b0ddfc: Merge "Save PatternVisible setting to crypto header" into lmp-dev 
* commit 'd2566bdbc91229b8b646ae165b1506fe571a91ec':
  Save PatternVisible setting to crypto header
 2014-08-21 16:47:08 +00:00
Chris Craik
c56a1a51a9 Merge "Clarify text shadow attribute/method comments" into lmp-dev 2014-08-21 16:46:53 +00:00
Nicolas Prevot
2236849d5f am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '85814a346c08eed294fd2c49fff317aaeca9840f':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:36:20 +00:00
Paul Lawrence
0080c2b08e am c8b0ddfc: Merge "Save PatternVisible setting to crypto header" into lmp-dev 
* commit 'c8b0ddfc90c5b448075438df5a0c3793e806163d':
  Save PatternVisible setting to crypto header
 2014-08-21 16:36:16 +00:00
Nicolas Prevot
01e6a6fef1 Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 2014-08-21 16:33:47 +00:00
Zhijun He
d38b381086 am 8fece5d0: am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit '8fece5d08a5ee0409a28f383a52ebc7dbfe8afda':
  Camera2: update aberration correction related tag name
 2014-08-21 16:33:43 +00:00
Jaewan Kim
5eaae72f72 am 48f09811: am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit '48f098115b6654ce8da754ff11b40965308f44d5':
  TIF: Accept any character for custom label.
 2014-08-21 16:33:38 +00:00
Paul Lawrence
7bf41929f2 Merge "Save PatternVisible setting to crypto header" into lmp-dev 2014-08-21 16:25:56 +00:00
Zhijun He
ffa904f68b am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit 'a34cf262ff0789ebe671ac89941a3f93095147da':
  Camera2: update aberration correction related tag name
 2014-08-21 16:22:46 +00:00
Jaewan Kim
8aaf7555fe am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit '1ca0c4f0ccedd26c90c20295b1eeb907073b6a18':
  TIF: Accept any character for custom label.
 2014-08-21 16:22:41 +00:00
Nicolas Prevot
465acf3f3f Marking the methods to get Profile/Device Owner with @SystemApi. 
BUG: 16860239

Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec
 2014-08-21 17:22:28 +01:00
Lorenzo Colitti
385e80a62c am 061ad3f4: am ff067823: Merge "Fix findConnectionTypeForIface." into lmp-dev 
* commit '061ad3f4656d747d959666c2290e7ba8d510d7af':
  Fix findConnectionTypeForIface.
 2014-08-21 16:20:38 +00:00
Wenchao Tong
0a3bd24f4c am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev 
* commit 'f654d5b210419e90ba674c73a20a3bcfa9f394e6':
  Revert "Annotate @SystemApi on some WifiManager methods."
 2014-08-21 16:20:34 +00:00
Behdad Esfahbod
39c62ef39d am 65122663: am ffb1c54b: Merge "Throw exception on nonexistent font" into lmp-dev 
* commit '6512266305ce42c463c3c4eb4ea1436622fc14b8':
  Throw exception on nonexistent font
 2014-08-21 16:20:29 +00:00
Kenny Guy
80ab66574a am 676fedb0: am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit '676fedb03498436cf6551ea9e0ae5486e7fe9e0c':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:20:24 +00:00
Esteban Talavera
29c6dfe446 am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '4536f11f64b6fa2d99f65424819f20401d2c0830':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:20:19 +00:00
Esteban Talavera
de7706999e am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit 'ff3bcbf8134faf2dfddf26bf00afd90c462e9699':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:20:15 +00:00
Jorim Jaggi
7ff086fdff am fa4b90b8: am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'fa4b90b870980baa42ff868d2d331effae70956d':
  Update notification layouts to match redlines
 2014-08-21 16:20:09 +00:00
Zhijun He
eee850d355 Merge "Camera2: update aberration correction related tag name" into lmp-dev 2014-08-21 16:17:52 +00:00
Lorenzo Colitti
bd8069177d am ff067823: Merge "Fix findConnectionTypeForIface." into lmp-dev 
* commit 'ff067823e482f512ba6938870035c0097426319b':
  Fix findConnectionTypeForIface.
 2014-08-21 16:14:11 +00:00
Wenchao Tong
67a7ee0f27 am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev 
* commit '2954d35a8ea73a59f9b333ecf3497022c57e5476':
  Revert "Annotate @SystemApi on some WifiManager methods."
 2014-08-21 16:14:06 +00:00
Behdad Esfahbod
76625e3b7f am ffb1c54b: Merge "Throw exception on nonexistent font" into lmp-dev 
* commit 'ffb1c54ba7d0d7b3bc5e6096c5937e6aff498cd4':
  Throw exception on nonexistent font
 2014-08-21 16:14:00 +00:00
Kenny Guy
98ecaa1ae6 am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit '87c29bd1b08b48b093808b8831bc23de69f9d318':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:13:54 +00:00
Esteban Talavera
b676afcacf am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit 'a47533ff3c3fdd6ad0d81266e75403eb441be141':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:13:44 +00:00
Esteban Talavera
da3b8a493a am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit '3e02b271fcea87e07534712127fad60b0ce92dab':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:13:39 +00:00
Jorim Jaggi
9921de0df1 am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'af1c312d19d9b786b2edc1e83d4688870a51ef17':
  Update notification layouts to match redlines
 2014-08-21 16:13:34 +00:00
Jaewan Kim
edaece1f30 Merge "TIF: Accept any character for custom label." into lmp-dev 2014-08-21 16:13:25 +00:00
Lorenzo Colitti
a945c35273 Merge "Fix findConnectionTypeForIface." into lmp-dev 2014-08-21 16:08:11 +00:00
Jaewan Kim
f0e530e4eb TIF: Accept any character for custom label. 
Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7
 2014-08-22 01:05:40 +09:00