Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
147,363 Commits 3 Branches 0 Tags
44e19907adb36b8ab44aebeb5a4938d4e0355639
Commit Graph

42596 Commits

Author SHA1 Message Date
Neil Fuller
44e19907ad am 8cb7a969: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp 
* commit '8cb7a969c5017c20b5eb0911ec8af4322daa8023':
  Don't assume languages are 2 letter codes.
  Switch TextUtils over to new ICU API.
 2014-07-31 13:42:14 +00:00
Sander Alewijnse
2310acbcc6 am c772b60a: am 1d7e62b7: am 9d032110: Fix deadlock window manager and device policy manager. 
* commit 'c772b60a94a2b3cb024be01bafd3a35b702f8eb1':
  Fix deadlock window manager and device policy manager.
 2014-07-31 13:42:05 +00:00
Dan Sandler
06834fd55e am 75bf3b3d: am 4d8aefee: am ed3a7e7c: Merge "Fix docs build." into lmp-dev 
* commit '75bf3b3d1abfd6a162fe2c007c7a81d16ef79326':
  Fix docs build.
 2014-07-31 13:41:51 +00:00
Neil Fuller
364fe22ecb Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp 2014-07-31 13:30:12 +00:00
Narayan Kamath
035dc34861 am 8b2de134: am bb97753b: Merge "Switch TextUtils over to new ICU API." 
* commit '8b2de134a609936e49380011e904cb277205781e':
  Switch TextUtils over to new ICU API.
 2014-07-31 13:26:45 +00:00
Primiano Tucci
a0cdfe137b Cleanup debug messages in WebViewFactory and WebViewUpdateService 
This is just a cleanup CL which fixes:
- Some erroneous debug messages about the relro creator process.
- The condition checked in WebViewUpdateService, to prevent the
  WebView to be used from the SystemServer (it now looks at the
  process id, previously it was erroneously looking at the uid).
- Adds a 5s. timeout to the waitForRelroCreationCompleted.

BUG:16403706

Change-Id: I43a953949050d7df5fe334cfa7257315ee6db071
 2014-07-31 12:53:34 +01:00
Narayan Kamath
8b2de134a6 am bb97753b: Merge "Switch TextUtils over to new ICU API." 
* commit 'bb97753bc546c7725652b68e6611a75350573466':
  Switch TextUtils over to new ICU API.
 2014-07-31 11:34:49 +00:00
Sander Alewijnse
a87863a8bd Fix deadlock window manager and device policy manager. 
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.

Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
 2014-07-31 09:16:46 +00:00
Bernhard Bauer
8989964ee3 Add a method to DevicePolicyManager to silently install a certificate / private key pair. 
BUG=15065444

Change-Id: Id3d255e1fce2c608501c3a038633a93c7f191426
 2014-07-31 09:30:13 +01:00
Lorenzo Colitti
87dffdd02b am 9200a867: am 6f088df9: am 44551060: Allow using third-party HTTP/... stacks for per-network URLs. 
* commit '9200a867a71b02c0147b0a9670f1e141d398aa43':
  Allow using third-party HTTP/... stacks for per-network URLs.
 2014-07-31 03:11:12 +00:00
Lorenzo Colitti
5b37fa2ed5 Allow using third-party HTTP/... stacks for per-network URLs. 
Also switch to double-checked locking for
mNetworkBoundSocketFactory and OkHttpClient.

Change-Id: Ic52776ee760036ad5623b7496156b8909dc282fa
 2014-07-31 02:17:28 +00:00
Torne (Richard Coles)
a53b0e6c05 Find WebView package name from a config resource. 
Use a config resource to determine the package name for the WebView
implementation to allow it to be changed by a resource overlay.

Bug: 16329371
Change-Id: I5977691c0223347e0382d584c3d3ee4428660180
 2014-07-30 18:46:04 -07:00
Andres Morales
8de157275c am 789b2b55: am 9884a1ac: am 3df55fc3: NFC Unlock api changes 
* commit '789b2b5558aaa379f00ec81496cbb29f00ee47fc':
  NFC Unlock api changes
 2014-07-31 01:22:31 +00:00
Andres Morales
11d2e53dc0 NFC Unlock api changes 
Bug: 16401635
Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
 2014-07-31 01:09:02 +00:00
destradaa
d2cf9d98da am f4fdceb1: am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs. 
* commit 'f4fdceb117ebdc41c2937da86a751936c0f8c21a':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:51:17 +00:00
destradaa
f9a274c9b8 Add support for sources in Geofencing APIs. 
Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
 2014-07-30 23:35:08 +00:00
Ruben Brunk
3c9e3c8211 am 49848592: am 6946415f: am e95f2a0e: camera2: Implement request templates for LEGACY. 
* commit '4984859292319f2f2ac42ea745012215e5bea84f':
  camera2: Implement request templates for LEGACY.
 2014-07-30 23:27:35 +00:00
Ruben Brunk
6a7d8c4289 camera2: Implement request templates for LEGACY. 
Bug: 15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b
 2014-07-30 23:15:16 +00:00
Ruben Brunk
c91eb58c4e am 91aedfe5: am ecdb20ca: am 3916e3ba: camera2: Add scene and effect mode for LEGACY. 
* commit '91aedfe5a21f0df770af6379af76211e3d6b12d1':
  camera2: Add scene and effect mode for LEGACY.
 2014-07-30 22:23:40 +00:00
Ruben Brunk
3fe9eba904 camera2: Add scene and effect mode for LEGACY. 
Bug: 15116722

Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
 2014-07-30 22:09:41 +00:00
Andres Morales
d63b641505 am 6f770576: am 0de25904: am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev 
* commit '6f770576d30ec901de45415a2ce37d0dfbb29fcc':
  Revert "NFC Unlock api changes"
 2014-07-30 21:46:41 +00:00
Alan Viverette
4bfbac82e4 am 72cb9b21: am 28affba6: am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '72cb9b21a3fc4173b42f85c052c0dee2fd137ac2':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 21:35:26 +00:00
keunyoung
176ded3d62 am 4e8e785e: am 669f8f22: am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 
* commit '4e8e785e2b7f58de656c7d473dcedd96c1a91e80':
  add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
 2014-07-30 21:35:18 +00:00
Andres Morales
d99760e87a am 8ecfad36: am 6b53a8a7: am 9fef5fbc: NFC Unlock api changes 
* commit '8ecfad3616258c191c23ff1048b7965c0bb03a06':
  NFC Unlock api changes
 2014-07-30 21:30:24 +00:00
Martijn Coenen
c18f9d6b71 am ffe93b5e: am 9791d590: am e5996ff4: Merge "Make some NFC APIs @systemAPI." into lmp-dev 
* commit 'ffe93b5eefae759fcffc61765d569cc80d9c33d4':
  Make some NFC APIs @systemAPI.
 2014-07-30 21:23:56 +00:00
Andres Morales
131197aa6e NFC Unlock api changes 
Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
 2014-07-30 21:17:06 +00:00
Christoph Studer
00781c693a am c63f6df8: am 2522c94a: am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev 
* commit 'c63f6df88623578ca199e9c108d36dc2859dc803':
  SysUI: Display group children when no summary is present
 2014-07-30 20:34:46 +00:00
Julia Reynolds
4ff2d1b4ea am abcc590d: am 5e625843: am 72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev 
* commit 'abcc590da8f6e1f2ec9d18e328a9ea8fc64f1f58':
  API council - DISALLOW_APPS_CONTROL -- need better documentation.
 2014-07-30 20:22:55 +00:00
Andres Morales
e9a8927662 Merge "Revert "NFC Unlock api changes"" into lmp-dev 2014-07-30 19:31:16 +00:00
Andres Morales
92b4b3c64d Revert "NFC Unlock api changes" 
This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.

Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
 2014-07-30 21:30:50 +00:00
Narayan Kamath
08b3516984 Switch TextUtils over to new ICU API. 
.. and use Locale.getScript() instead of ICU.getScript.

bug: 15876704
Change-Id: Idf9462d8ef568dbc88c95e65a971184952e97872
 2014-07-31 11:29:44 +00:00
Alan Viverette
46359204a8 Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 2014-07-29 21:36:00 +00:00
Alan Viverette
0c0dde7171 Update switch assets, fix SearchView asset 9-patch areas 
BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3
 2014-07-30 13:37:35 -07:00
keunyoung
fa75e3d465 Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 2014-07-29 21:36:00 +00:00
keunyoung
1d0a7ccd00 add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode 
- When this flag is set, system no longer keeps the display on while in car mode.

bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db
 2014-07-30 14:12:34 -07:00
Martijn Coenen
29c2e3797a Make some NFC APIs @systemAPI. 
Change-Id: I12e292563a517211e4fae7a1f64021758f396d1a
 2014-07-30 21:03:07 +00:00
Christoph Studer
3d5e26d659 am 09473140: am 0b928f7d: am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev 
* commit '0947314029aa6c40f875703356a9c06417d356a8':
  Strip RemoteViews from Notifications, re-create them in SysUI
 2014-07-30 19:45:02 +00:00
Sandeep Siddhartha
9a576f2174 am 041b0b6e: am ae7848f4: am 059ffa19: Merge "Make startRecognition async" into lmp-dev 
* commit '041b0b6ef8cd61014c5d00e05e0c2d322d675c42':
  Make startRecognition async
 2014-07-30 19:15:02 +00:00
Jose Lima
0e746b99c2 am ccc2ffaf: am 0d8fe95d: am 28ba97e3: Added LEANBACK_SETTINGS Intent category 
* commit 'ccc2ffaf35dfe35148e582cf0fb1417929dd8e6c':
  Added LEANBACK_SETTINGS Intent category
 2014-07-30 19:09:48 +00:00
Jose Lima
73915cf2ca Added LEANBACK_SETTINGS Intent category 
- Added new Intent category (as a hidden/system API) to be
     used to identify Leanback settings activities that should
     be listed in the Leanback launcher.

Change-Id: Ia31244fb87a66f63ddad562e02e577111573d728
 2014-07-30 18:56:25 +00:00
Paul Jensen
fb1a3d4ddf am 0f59a16d: am 4d00f65c: am 43293a8b: Merge "Use a new socket for each of the host\'s IP addresses." into lmp-dev 
* commit '0f59a16de57c575d51e66d8ada983a4dd4860111':
  Use a new socket for each of the host's IP addresses.
 2014-07-30 18:54:00 +00:00
Nicolas Prevot
634c163115 am 723f72cf: am 8c94276a: am 58e96946: Using the selector to check if an intent can be forwarded. 
* commit '723f72cf41bce8853c7cb4de6e9c6b113fe93e07':
  Using the selector to check if an intent can be forwarded.
 2014-07-30 18:43:05 +00:00
Ben Murdoch
23ec52e669 Remove dependency on WebView native library path. 
This CL removes the final use of the hardcoded WebView
library path from WebViewFactory. We now use a system
property to set the amount of address space to reserve
in the zygote rather than stat'ing the file.

See also I07ad5a774623c1899eb50474d999a2b1447783f0

Change-Id: Id3c1e3cc2e2a06c1021ad0260a37abcd07d78fd6
 2014-07-30 19:36:31 +01:00
Nicolas Prevot
ce673ffd22 Using the selector to check if an intent can be forwarded. 
In IntentFowarderActivity, if the selector of an intent is defined,
use it to check if the intent can be forwarded.

Change-Id: Ic77f70bca5596e0a5fb0fec9b7a693afaa649089
 2014-07-30 18:23:43 +00:00
Chris Craik
af4d04cab6 Use RoundRect clipping for circle reveal animation 
bug:16630975

Also, remove inverse clipping feature from reveal animator.

Change-Id: I770a4eb48cd123b0ca0f39d16a0f3eefd1be3653
 2014-07-30 17:15:50 +00:00
Christoph Studer
f660edb25a Merge "SysUI: Display group children when no summary is present" into lmp-dev 2014-07-25 23:01:28 +00:00
Christoph Studer
c8db24bc32 SysUI: Display group children when no summary is present 
Also move common notification filtering into NotificationData
such that clients won't have to do it themselves anymore.

Probably also fixes a couple of multi-user issues.

Bug: 16302692
Bug: 16224431
Change-Id: Ic3c11cd1a224044486f5544e068ca5297d30c521
 2014-07-30 21:43:17 +02:00
Julia Reynolds
12451a39f4 Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev 2014-07-25 23:01:28 +00:00
Julia Reynolds
c617f81545 API council - DISALLOW_APPS_CONTROL -- need better documentation. 
Bug: 16401636
Change-Id: I168033eaabdb953d8e73f63792a7e729eb9eeff6
 2014-07-29 14:01:30 +00:00
Paul Jensen
e9ac817e83 Merge "Use a new socket for each of the host's IP addresses." into lmp-dev 2014-07-25 23:01:28 +00:00