Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
ed368be792 Merge "Frameworks/base: Wall Werror in media/tests" 2014-11-21 17:39:33 +00:00
Andreas Gampe
e042791e75 Merge "Frameworks/base: Remove unused header" 2014-11-21 17:38:07 +00:00
Scott Rowe
14f78ed7b8 Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 2014-11-21 17:34:29 +00:00
Sreeram Ramachandran
c2c0beab79 Allow VPNs to specify their underlying networks. 
These are used when responding to getActiveNetworkInfo() (and cousins)
when an app is subject to the VPN.

Bug: 17460017
Change-Id: Ief7a840c760777a41d3358aa6b8e4cdd99c29f24
 2014-11-21 09:26:18 -08:00
Selim Cinek
9c4a707912 Fixed several time related states for secondary users 
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.

Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
 2014-11-21 18:25:30 +01:00
Rubin Xu
7f9e014b00 String literals for CL ag/586597 
Mini-CL to get the strings in for translations.

Bug: 17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
 2014-11-21 17:04:11 +00:00
Sreeram Ramachandran
75f018e6a7 Delete unused/non-working code. 
Change-Id: I2cba9ffdb4ed547cb922d0ac08abf81e49ffa66b
 2014-11-21 08:08:19 -08:00
Sreeram Ramachandran
21b5ee3f0e Eliminate race conditions in UID-based network filtering. 
The previous code retrieved information from the legacy tracker multiple
times for each user query, leading to race conditions where the info
could've changed between the calls.

Refactors the handling of legacy data types in ConnectivityService and
unifies call paths so that APIs that deal with legacy data types
(NetworkInfo and int/networkType) and newer types (such as Network) go
through common code paths, using NetworkState to hold all the necessary
data pieces. This enables follow-on bug fixes to getActiveNetworkInfo().

The changes are limited to public "query" APIs (those that retrieve some
network information or the other). More details about the specific
changes and their rationale can be found in the code review thread.

Bug: 17460017
Change-Id: I656ee7eddf2b8cace5627036452bb5748043406c
 2014-11-21 08:07:13 -08:00
Zoltan Szatmary-Ban
ffba290a33 am 5c374a58: am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit '5c374a582ceff913e420d21d63e1d7b087d6fc56':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:31:49 +00:00
Zoltan Szatmary-Ban
ce2552d980 am 99d983b0: am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev automerge: b3e8ff0 
* commit '99d983b0860272c2edf4e2585995ec064e759b6b':
  Adding method to query backup manager service activity status
 2014-11-21 15:31:44 +00:00
Zoltan Szatmary-Ban
5c374a582c am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit 'b3d0580f0fa126c258c54e8007ea8d51ed12810f':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:28:20 +00:00
Zoltan Szatmary-Ban
99d983b086 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
automerge: b3e8ff0

* commit 'b3e8ff00c85f37686a45597636d546a5e2a32c26':
  Adding method to query backup manager service activity status
 2014-11-21 15:26:51 +00:00
Zoltan Szatmary-Ban
b3d0580f0f am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit '08229e817ecb67b0c7ebbd6b5b9ce4aef1b38cc2':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:24:39 +00:00
Zoltan Szatmary-Ban
b3e8ff00c8 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
* commit '07334334aab3863408325653ceccee47f9e1788d':
  Adding method to query backup manager service activity status
 2014-11-21 15:24:33 +00:00
Zoltan Szatmary-Ban
08229e817e Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 2014-11-21 15:21:07 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Adrian Roos
7e2e40e127 Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045 
Fix log spam and wrong log string.

Bug: 18414067
Change-Id: I588ec7b62055d2374d311d3adf9edd500ca40380
 2014-11-21 15:27:12 +01:00
Adrian Roos
c5db390f5b Revert "Only keep user switcher bitmaps if needed" 
This reverts commit cba0faadbe 
with change id I416beb82156787e61ee1f59b6726fd702f135f68.

It keeps the fix preventing us from reclipping already loaded
bitmaps.

Bug: 18350670
Change-Id: I0562d38d2a6eb0b715adcd4ca77512f2cbedd320
 2014-11-21 13:59:42 +00:00
Adrian Roos
31b844ba0c Explicitly specify user for public mode 
Bug: 18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
 2014-11-21 13:55:09 +01:00
Paul Jensen
6b0de80083 am 416a0b1c: am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev automerge: 934b73f 
* commit '416a0b1cc9c14039992799510808f24e7f03a99b':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:54:59 +00:00
Paul Jensen
416a0b1cc9 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev 
automerge: 934b73f

* commit '934b73fb50afd4280a1b6a509376ca86424fa7b2':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:50:35 +00:00
Paul Jensen
934b73fb50 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev 
* commit '0653f508b58eab994089ae2da783852a5c1b4a8a':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:47:23 +00:00
Paul Jensen
0653f508b5 Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev 2014-11-21 12:42:34 +00:00
Adrian Roos
f8f56bce42 Fix DPM.resetPassword("") 
While we're at it, also fix some multi-user issues in
LockPatternUtils.

Bug: 17496766
Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
 2014-11-21 13:34:06 +01:00
Geoffrey Borggaard
9a5974734f am e400f811: am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e400f811f28fbf8b6055b9efc8afbee11ba08f67':
  Fix null handling in proxies.
 2014-11-21 12:20:00 +00:00
Ricardo Cervera
dc12af4ec6 am 0b3963e3: am d9e6f658: am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 
* commit '0b3963e358a4f664aa215292551371cfb07c1d6f':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 12:19:55 +00:00
Ricardo Cervera
537c91efcc am bc250401: am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 
* commit 'bc250401fe0baacb8880ba7d85364de3e6df11b9':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 12:19:50 +00:00
Filip Gruszczynski
b898936a00 am 5a429758: am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5a429758e9df7b49c616105b510eff42bf7bde69':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 12:19:45 +00:00
Andrew Solovay
eeb06d941f am a1c2b6a9: am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b automerge: 5a75a66 
* commit 'a1c2b6a9e9dc9e41a7a7dce609ab77ba45ada36e':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 12:19:40 +00:00
Elliott Hughes
021b03c91b am 7e28e78b: am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1 automerge: 889a259 
* commit '7e28e78b651769d64543e7e83d3f46a07d807ae7':
  Fix and be more explicit about plurals best practices.
 2014-11-21 12:19:36 +00:00
Dirk Dougherty
36dfe4cb15 am 448d1ffc: am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a automerge: 1896e58 
* commit '448d1ffcadab7cee678100137aad9435a2088695':
  Doc change: localized content.
 2014-11-21 12:19:31 +00:00
smain@google.com
845e81e220 am 2dc4cfa0: am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 automerge: 39d6b21 
* commit '2dc4cfa09617cfa660728b3c972f840853a80583':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 12:19:23 +00:00
Quddus Chong
5bd45a6671 am 5b51858d: am ecccf10b: am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 
* commit '5b51858dc29f7892c17c82ef1c2fecf767c89f41':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 12:19:19 +00:00
Deepanshu Gupta
7cfcfba9d3 am fbff0191: am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df 
* commit 'fbff0191f60722894291529af28f14af7bb967e4':
  Fix setTextAppearance for styles with dots.
 2014-11-21 12:19:14 +00:00
Deepanshu Gupta
3dd0d906ae am 7676f576: am b4a23798: am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours 
* commit '7676f57608d1a3327799853511cf97d1ab437cbc':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-21 12:19:09 +00:00
John Spurlock
46803a438c am dc3e7d28: am ed06df13: am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 
* commit 'dc3e7d282c7be63388190fcf0c168735ceb9cafe':
  Doze: Make proximity check configurable.
 2014-11-21 12:18:54 +00:00
Christopher Tate
972b140745 am 5b0528b5: am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev 
* commit '5b0528b5e1374cbb55169d81ab83f866b3e127be':
  Recents backup helper
 2014-11-21 12:18:31 +00:00
Alan Viverette
d679cf04de am ac280c48: am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev automerge: fa4eba9 
* commit 'ac280c48d05c4d23f0d2b0e2622376b374198fef':
  Update scrollbars to match Material spec
 2014-11-21 12:18:26 +00:00
Alan Viverette
ced4c827af am a35d07a4: am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev automerge: 69b802f 
* commit 'a35d07a4f0bb743e03fc5422b45851e639c2f0a8':
  Update overflow menu alignment to match spec
 2014-11-21 12:18:21 +00:00
Dianne Hackborn
caff64dfe7 am 676b1d88: am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev automerge: c43613b 
* commit '676b1d886c95a2481dc377a9c2a6e045f08326e0':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
 2014-11-21 12:18:15 +00:00
Geoffrey Borggaard
609a71cfa7 am 235fcdce: am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf automerge: db1e7fa automerge: 6a110c1 
* commit '235fcdceb439fe676f6876c6c74626718363c540':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 12:18:05 +00:00
Alan Viverette
2c44d8ab1f am ea28d459: am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev automerge: 9eb4ee24 
* commit 'ea28d4594d24c118def2f16ee98b771d5e704f69':
  Make DeviceDefault alert dialog themes public
 2014-11-21 12:18:00 +00:00
Erik Kline
6772a8754d am 30246e3d: am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev automerge: dedd42a 
* commit '30246e3d3782c2f95289e352c1a17dd1314ab660':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 12:17:38 +00:00
John Reck
565e9be4ac am 51efa8ef: am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev automerge: d3e5777 
* commit '51efa8ef3f3faeec5772fccf46f629f2e44853c2':
  If the surface is lost, release it
 2014-11-21 12:17:33 +00:00
Narayan Kamath
57616d3e55 resolved conflicts for merge of 18e3727f to master 
Change-Id: I3d74db13f163ac3f23955b6c7d8469e7a8f93066
 2014-11-21 11:57:07 +00:00
Geoffrey Borggaard
e400f811f2 am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit '8a2ac41dcfa0ec10c09a7599d9345798c21cd47d':
  Fix null handling in proxies.
 2014-11-21 10:31:03 +00:00
Ricardo Cervera
0b3963e358 am d9e6f658: am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 
* commit 'd9e6f658a5bf3e5356a433f275bf2a60921b5a6c':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:26:43 +00:00
Ricardo Cervera
bc250401fe am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 
* commit 'd4ea7b3cb626dbd807fed9477c50726fb7dd38a2':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:26:37 +00:00
Filip Gruszczynski
5a429758e9 am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit '5ea0411f3900064f1d65b93bbe306525398ee4d7':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:26:31 +00:00
Geoffrey Borggaard
8a2ac41dcf am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e548c3a3786a252d42b3c0ae0823f4718fcb9718':
  Fix null handling in proxies.
 2014-11-21 10:25:37 +00:00