Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,032 Commits 3 Branches 0 Tags
c876b09e2e0717eec1de35069ace7342f2248ecc
Commit Graph

41583 Commits

Author SHA1 Message Date
Marcin Kosiba
4debd8ed58 am 85fece5c: am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '85fece5c6d284afb58a7550a55d24606a20b4905':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-13 02:16:17 +00:00
Sander Alewijnse
923f567c85 am ae675cb2: am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit 'ae675cb2a18ec63ae69bd1b69ea7b5a2f486cce0':
  Rename email extra.
 2014-09-13 02:15:59 +00:00
Alexandra Gherghina
c0f0a96ce4 am b566b869: am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 
* commit 'b566b869a88485f33f4ae1a281d3c5c0487c95d0':
  Assign default icon to users at creation time and in SystemUI.
 2014-09-13 02:15:54 +00:00
George Mount
7c736df48f am b2d22b3d: am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 
* commit 'b2d22b3dd381243a292b2f1b405ef52f35dbf4b3':
  Fixed NPE in EnterTransitionCoordinator
 2014-09-13 02:15:42 +00:00
Chris Wren
d79e4cd8c8 am 700269d6: am 04322209: am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 
* commit '700269d6a98920e3b7df9202b901f63852c75530':
  remove unused matchesCallFilter(Bundle, int)
 2014-09-13 02:15:34 +00:00
Christoph Studer
72b4556267 am add991ff: am fa1033fc: am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev 
* commit 'add991ff3a5fd9b5ccc562441ecf437f5e2f2f1f':
  Notification: Reset chronometer visibility
 2014-09-13 02:15:26 +00:00
Kenny Guy
456a14ac4e am 09e1ce52: am 46247469: am b5153aba: Hide APIs renamed during API review of LauncherApps 
* commit '09e1ce5249141b0b97e34e16f9f43b15f8b552f5':
  Hide APIs renamed during API review of LauncherApps
 2014-09-13 02:15:14 +00:00
Jessica Hummel
ea7c1dc4a9 am 1a1b9446: am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit '1a1b94468b14a4627614cb7fb9a057076c2369bd':
  Use correct string for provisioning complete action.
 2014-09-13 02:14:54 +00:00
Jinsuk Kim
63261163ac am a34e6334: am 527346ab: am ead8ed86: CEC: Bug fixes for vendor-specific command handling 
* commit 'a34e6334cd2deb1b66c08766a8de4817523f18cb':
  CEC: Bug fixes for vendor-specific command handling
 2014-09-13 02:14:39 +00:00
Yohei Yukawa
db2d31a2d2 am 869642df: am 5bdb322f: am b7dd9519: Merge "API Review: Clean up removed APIs" into lmp-dev 
* commit '869642df55345676fbdd263708bd1380d3eba483':
  API Review: Clean up removed APIs
 2014-09-12 19:28:25 +00:00
Jinsuk Kim
5ae2f08971 am db7eb5b3: am 6d4c60e8: am b3ac0ef8: Merge "Replace the MHL register name \'scratchpad\' with \'vendor\'" into lmp-dev 
* commit 'db7eb5b3c87c56128b421f5928242246f3261b39':
  Replace the MHL register name 'scratchpad' with 'vendor'
 2014-09-12 19:26:08 +00:00
Craig Mautner
efd34c4834 am bebb3088: am a7027783: am 31632435: Merge changes Ia6fe9724,I682b9acb into lmp-dev 
* commit 'bebb3088ab9d4ee7bcacdb2904c47ae3470a7090':
  Show all windows from activity that hides keyguard
  Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
 2014-09-12 19:26:02 +00:00
Alan Viverette
21360c7339 am 5c2c69bb: am 36348edf: am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev 
* commit '5c2c69bb552f2d7eaa357969ab0da8877441cc5a':
  Remove unsafe methods that take TypedArray
 2014-09-12 19:25:52 +00:00
Michael Wright
93f120b6ee am f015309d: am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY 
* commit 'f015309d6df6647732d35e01133d278cd2b59e69':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
 2014-09-12 19:24:52 +00:00
George Mount
66618a18de am d40001d5: am 4ac75dce: am 67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev 
* commit 'd40001d585e818609ad9169da0a557a9dde1e16f':
  Fixed empty TransitionSet not notifying listeners.
 2014-09-12 19:24:46 +00:00
Amith Yamasani
20320aac7b am b7db8990: am 807bce1c: am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 
* commit 'b7db89906f6f7e7bae1213a1a17dac0b536bf45b':
  Annotate bindServiceAsUser with SystemApi
 2014-09-12 19:24:42 +00:00
Alan Viverette
55e948e41f am 30225f51: am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 
* commit '30225f51f0c00043c96f6f74e10a5181c1c4b10b':
  Vertically align toolbar child views with similar gravities
 2014-09-12 19:24:27 +00:00
Adam Powell
6e9f8a7be1 am 9854feaf: am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev 
* commit '9854feaf50aeae95adfa1a70e037a95d4cd3b85d':
  Remove View methods that can't be used safely from the SDK
 2014-09-12 19:24:10 +00:00
Craig Mautner
72c781d7d0 am 2df97e5f: am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev 
* commit '2df97e5f112ac74e34cf7ec243c1e37b4b1fd921':
  If activity is an alias get maxRecents from target
 2014-09-12 19:24:05 +00:00
Jeff Davidson
4dd5383175 am 1cb2e760: am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 
* commit '1cb2e7603e13c23594b5a03b56f2fafd09d94c38':
  Update VpnService Javadoc to reflect new UX.
 2014-09-12 19:24:00 +00:00
Prerepa Viswanadham
8e91c94ca0 am a4a6bca6: am 0d8efe53: am 041299e3: Remove onConnectionCongested callback 
* commit 'a4a6bca675df63115b52e7a16aebbdd6beb59657':
  Remove onConnectionCongested callback
 2014-09-12 19:23:47 +00:00
George Mount
e799cd44e0 am d28671db: am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev 
* commit 'd28671db218886b24ca3fe38ad8446fdef04b5dc':
  Fixed: TransitionSet setStartDelay did nothing.
 2014-09-12 19:23:31 +00:00
George Mount
bc12aa06e0 am 9c663fcf: am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9c663fcfb9efc4313bcaf57ee52d207bd2c4ea35':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 19:23:26 +00:00
Igor Murashkin
67335343f4 am 0682190b: am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 
* commit '0682190b025b5039567532de2a752a00e7c20977':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
 2014-09-12 19:23:15 +00:00
Sreeram Ramachandran
dd6ecbaaee am 2b3b6875: am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 
* commit '2b3b68753f4bb2231d9a17393fdfeac93a1b24c0':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
 2014-09-12 19:23:08 +00:00
Chet Haase
3e2ff75f7b am 4280132f: am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev 
* commit '4280132f44a20d42cffd436d8eab7653c82b3249':
  Make starting window hw-accelerated
 2014-09-12 19:22:14 +00:00
Robin Lee
e5c0bc9530 am 7ee71d8a: am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit '7ee71d8a7be25bea6b66b26898945b27dffb3af6':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-12 19:19:24 +00:00
Marcin Kosiba
26dd49f4c1 am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '6e6ae86a8659a02e30bdf1a9ec4ca910c4a78215':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-12 19:19:04 +00:00
Matthew Williams
b0b0b7fd30 am f94a6a7c: am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit 'f94a6a7c55682d634b4d0f9a1184afe57d18f3c4':
  Add flag to JobParameters for job expired
 2014-09-12 19:18:50 +00:00
Sander Alewijnse
fc27bbc043 am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit 'a0b249b28ea08044287a4a3558e538ab766312b3':
  Rename email extra.
 2014-09-12 19:18:48 +00:00
Alexandra Gherghina
272d79c715 am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 
* commit '92f8d577c50a54e8375435813096b997d58cd368':
  Assign default icon to users at creation time and in SystemUI.
 2014-09-12 19:18:43 +00:00
George Mount
a03396e080 am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 
* commit '42e7043d4f5c0f8daa8139ebb154c80e82dd3f54':
  Fixed NPE in EnterTransitionCoordinator
 2014-09-12 19:18:33 +00:00
Amith Yamasani
3b4bc41239 am 411eda84: am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '411eda84661bb1ddde095e51c00bc05a71d86451':
  Apply cross-user restrictions to Shell
 2014-09-12 19:18:30 +00:00
Chris Wren
2ec88183e8 am 04322209: am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 
* commit '043222093990ee001561dc86b6850056d65dfe9b':
  remove unused matchesCallFilter(Bundle, int)
 2014-09-12 19:18:27 +00:00
Christoph Studer
9758f55262 am fa1033fc: am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev 
* commit 'fa1033fc2119942ca3f8578e257ed52fee227f37':
  Notification: Reset chronometer visibility
 2014-09-12 19:18:20 +00:00
Kenny Guy
bc1c747855 am 46247469: am b5153aba: Hide APIs renamed during API review of LauncherApps 
* commit '4624746908b1792eee967305b6db368f0263ebae':
  Hide APIs renamed during API review of LauncherApps
 2014-09-12 19:17:54 +00:00
Jessica Hummel
d4463cd8bf am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit '8dd58a3e642c25cf7c2b9984fbb46c0961a0da45':
  Use correct string for provisioning complete action.
 2014-09-12 19:17:38 +00:00
Alexandra Gherghina
c323e1cbca am 23e809a3: am 3507cc0f: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit '23e809a396c44ab7c2b8a103b621ee49a9947640':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-12 19:17:37 +00:00
Przemyslaw Szczepaniak
990d99290d am c67fbc95: am 817dbc8c: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit 'c67fbc959991bb9c49ffcd4f0f238d74541a18d2':
  Replace TreeSet with HashSet.
 2014-09-12 19:17:26 +00:00
Jinsuk Kim
ff0133a194 am 527346ab: am ead8ed86: CEC: Bug fixes for vendor-specific command handling 
* commit '527346ab17d4090a15c3408db2047f5e6800c8f4':
  CEC: Bug fixes for vendor-specific command handling
 2014-09-12 19:17:22 +00:00
George Mount
79055af7e4 am ad2317c7: am 6a6c4eed: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit 'ad2317c7dd51b1c0bbac223ef467d7a5b9ee613e':
  Omit appearing views that have a parent that is also appearing.
 2014-09-12 19:17:21 +00:00
Julia Reynolds
056c6d0e95 am b5f388f8: am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'b5f388f8f6b94dae5b8a4d4eb68316d52df4cdcd':
  Allow device owners to update LOCATION_MODE.
 2014-09-12 19:17:02 +00:00
Alexandra Gherghina
d681c23cd6 am dda4634d: am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit 'dda4634da53dd9732969ebf0871c9f4f3760c600':
  Remove package level intent forwarding.
 2014-09-12 19:15:56 +00:00
Paul Jensen
f0a0068496 am 14add2d2: am 576fc3ca: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit '14add2d2140a85394024d67bb8d7fd156920721a':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-12 18:04:11 +00:00
Paul Jensen
cb2403d453 am d0295aac: am 09ff9d7e: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit 'd0295aac9c30e820424678fca3c0c7eaa8bdba65':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-12 18:04:06 +00:00
Marcin Kosiba
288e7de22e Remove an @removed member of andorid.webkit.WebResourceResponse. 
BUG: 17253647
Change-Id: I02f4f0600a09ceb3b68ba2698b80e413e7511663
 2014-09-12 18:24:49 +01:00
Sander Alewijnse
098116854e Merge "Rename email extra." into lmp-dev 2014-09-12 16:14:30 +00:00
Alexandra Gherghina
3e7115ed02 Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 2014-09-12 16:03:39 +00:00
Alexandra Gherghina
64d4dca63f Assign default icon to users at creation time and in SystemUI. 
Right now different code in System UI, Settings app and other places replace the
user icon with their own default. This tries to make it consistent by moving the
mechanism used in Settings in a helper class.

Bug: 17311038
Change-Id: Ic858c65bf82a98b9806dbba029e7cdcf441f372e
 2014-09-12 15:43:42 +01:00
George Mount
2418d7381f Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 2014-09-12 14:09:23 +00:00