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

39280 Commits

Author SHA1 Message Date
Jinsuk Kim
21fea58928 am bac4a7fe: am 9a82e363: am d1f48b1e: Merge "System API HdmiControlService.getActiveSource" into lmp-dev 
* commit 'bac4a7fecae2a5727a9b7f1234ebab8039cbd713':
  System API HdmiControlService.getActiveSource
 2014-08-01 20:49:50 +00:00
Wei Wang
12f013dfa1 am bc61cadd: am 61e6c1e0: am 1d5fcf03: Merge "Service data and manufacturer data can be repeated fields." into lmp-dev 
* commit 'bc61cadd12b6bc2a4ea396d97a23efe9fae4aa37':
  Service data and manufacturer data can be repeated fields.
 2014-08-01 20:49:45 +00:00
Sandeep Siddhartha
47607d07ea am f6a30eb6: am b8265920: am b8ffb28e: Merge "Tighten the checks around a detector being invalidated" into lmp-dev 
* commit 'f6a30eb6f86a16d5dae1ad392c5a08292e7f446a':
  Tighten the checks around a detector being invalidated
 2014-08-01 20:49:35 +00:00
Chris Craik
4b21a860f2 am 50c3b992: am 538b96fd: am 264ace0b: Merge "Add outline alpha" into lmp-dev 
* commit '50c3b992c1d43bb49134721d10aa4201a1c15f44':
  Add outline alpha
 2014-08-01 20:49:30 +00:00
Jeff Sharkey
96f0c8dd4f am 2b7fc490: am cc2e3136: am 2e7a3cb7: Merge "Persist install sessions, more lifecycle." into lmp-dev 
* commit '2b7fc490a7a2844ea2978b174eab34cb83e64b8b':
  Persist install sessions, more lifecycle.
 2014-08-01 20:49:25 +00:00
Amith Yamasani
6ba20b05a2 am f6755a1f: am 4b83daa7: am ba789da8: Merge "Setup correct initial guest restrictions" into lmp-dev 
* commit 'f6755a1fade881792890f05c5f5b8e0ebeab06b5':
  Setup correct initial guest restrictions
 2014-08-01 20:49:21 +00:00
George Mount
23785adfe9 am b3bd029b: am dab97bb2: am 044a7d67: Add differentiating transitions for returning/reentering. 
* commit 'b3bd029b5ab2df8c86ab903bc597f858298be157':
  Add differentiating transitions for returning/reentering.
 2014-08-01 20:49:16 +00:00
Wonsik Kim
7cd42da6cf Fix NPE when fused geofence hardware is not available. 
b/16690237

manual cherry pick to make master bootable, since automerger does not seem to be working

Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
(cherry picked from commit cb92d507167fcce059c4ae91dc46b496f49b4fa3)
 2014-08-01 06:45:12 +00:00
George Mount
68f96d8db5 Add differentiating transitions for returning/reentering. 
Bug 16550363

Change-Id: I85f9a8bcbc92ce048d06b36579bb05893534f7f8
 2014-07-31 21:58:06 +00:00
Chris Craik
8e554924c5 Merge "Add outline alpha" into lmp-dev 2014-07-31 21:44:36 +00:00
Chris Craik
77b5cad3ef Add outline alpha 
bug:16140822
bug:16566746

This allows background drawables to alter the opacity of a shadow
being cast with their own alpha values.

Change-Id: I49698cc7c1bf4b2b55ffe2f82899543ca62bc61c
 2014-07-31 12:29:57 -07:00
George Mount
66ecd02018 am 5f5b80a5: am ced4e24b: am 4b71e7f7: Merge "Fix visibility propagation check." into lmp-dev 
* commit '5f5b80a5b39b18c7eb1d5979d6419b8183ccaf7f':
  Fix visibility propagation check.
 2014-07-31 17:35:55 +00:00
Evan Charlton
2e5fbbe867 am ef1a64ec: am 7fedbd06: am 0e097002: Fix a small typo in javadocs 
* commit 'ef1a64ec49ce6a28f87179ca863ecac337288df7':
  Fix a small typo in javadocs
 2014-07-31 16:28:19 +00:00
Evan Charlton
b8d0717934 Fix a small typo in javadocs 
Service#START_FLAG_RETRY has an extra word; remove it.

Change-Id: I4743e2ea474c70fe5d31f1a4ef257f9752f8e823
 2014-07-31 16:14:22 +00:00
Alexandra Gherghina
3d92d12151 am fdf33a8b: am 4b990549: am 8b0b1504: Use the appropriate default icon 
* commit 'fdf33a8b803683887240b7d4ef6e614bc77ddc79':
  Use the appropriate default icon
 2014-07-31 15:55:32 +00:00
Alexandra Gherghina
a709314537 Use the appropriate default icon 
ComponentInfo subclasses and ApplicationInfo have different ways to retrieving
the default icon. Previously, in CL I2db300a69a08030eacc245ee91556f0443ba5878
we defaulted everything to the green Android. This makes sure that they get the
right default.

Bug: 16630068
Change-Id: Ifa499eac6f1543523d6ecf0831175bfd6b772edb
 2014-07-31 15:43:11 +00:00
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
George Mount
6ceac2eafb Fix visibility propagation check. 
Bug 16704963

Change-Id: I2538bac4b4565ac8c6b27407c7679fea55b1092b
 2014-07-31 17:05:37 +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
Wonsik Kim
c2b74b73a1 Fix NPE when fused geofence hardware is not available. 
b/16690237

Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
 2014-07-31 18:24:23 +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
Wei Wang
76f3cceea6 Merge "Service data and manufacturer data can be repeated fields." into lmp-dev 2014-07-29 22:44:51 +00:00