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

182331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
bb8ed646f0 Merge "Pass the new progress when updating a ProgressBar" 2015-02-11 22:15:49 +00:00
Wale Ogunwale
2c5763ae5d Am command to split a stack. 
Change-Id: Idf3a364fc3826f6fe92f55b5c83b16b380d62ff4
 2015-02-11 14:02:19 -08:00
RoboErik
5b07143e36 Pass the new progress when updating a ProgressBar 
There was a race condition where the update for a progress change
from the user could pass the wrong progress value causing apps to
treat a non-user update as a user update.

bug:18515012
Change-Id: Ia62a1d07cd15f99effbf644642307c71049748f2
 2015-02-11 13:52:05 -08:00
Adam Powell
f6d4045d6c Add DENSITY_280 
Bug 19350604

Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
 2015-02-11 13:34:43 -08:00
Craig Mautner
082500c76e Don't relayout based on a window that isn't visible 
The method commitFinishDrawingLocked returned true even if the window
it was called for was hidden. By returning the value that
performShowLocked() returns it only returns true if the window is
shown.

Fixes bug 19100757.

Change-Id: I45df70aedcb3909561fd3a19e861579a11521db9
 2015-02-11 13:24:19 -08:00
destradaa
c91ac68829 Update handling of enum/flag fields in GPS data structures. 
It fixes cases when flags where filtered in the platform, because they were
checked as enums.
It also simplies handling of future values in enums/flags.

Change-Id: I83a0f82cc4562749081bf7e279ea52e2d5ba1f7c
 2015-02-11 13:16:28 -08:00
RoboErik
5b179afb19 Merge "Add extra logging for media button events" 2015-02-11 21:14:41 +00:00
RoboErik
e7b3c5e3ca Add extra logging for media button events 
Adds some conditional extra logging to help track down where key events
are coming from.

bug:19334464
Change-Id: I54e955a7e234bd1c45598e18a68cca4c83069487
 2015-02-11 13:10:18 -08:00
Alex Klyubin
05ecfd308d am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp 
* commit '33d3c53da021f0d044028860ace0f4ad817273f5':
  Move hidden ApplicationInfo flags into a separate field.
 2015-02-11 20:47:31 +00:00
Alex Klyubin
33d3c53da0 resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a
 2015-02-11 12:37:12 -08:00
Michael Wright
62958c7f30 am 33bb70d6: am 40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e 
automerge: c093955

* commit 'c093955af1434a7023093acb148ab152d915e59c':
 2015-02-11 20:03:06 +00:00
Michael Wright
c093955af1 am 33bb70d6: am 40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e 
* commit '33bb70d613cf8ed4664c4cc4047ae67f98599b32':
 2015-02-11 19:59:16 +00:00
Michael Wright
33bb70d613 am 40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e 
* commit '40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55':
  Stop active media projections on user switch.
 2015-02-11 19:50:56 +00:00
Luan Nguyen
e4b5387d62 docs: Fix issue with onCreate() method declaration in file backup section 
bug: 3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
 2015-02-11 11:38:41 -08:00
Alex Klyubin
517e0274cb Merge "Move hidden ApplicationInfo flags into a separate field." 
automerge: 1a24bb5

* commit '1a24bb597aeb1b019d55988b574e5db1b0e4232c':
  Move hidden ApplicationInfo flags into a separate field.
 2015-02-11 19:34:30 +00:00
Alex Klyubin
1a24bb597a Merge "Move hidden ApplicationInfo flags into a separate field." 2015-02-11 19:27:14 +00:00
Luan Nguyen
14ec5fe09e docs: Update device art generator to include Wear generic devices. 
bug: 14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
 2015-02-11 11:17:10 -08:00
Alex Klyubin
b9f8a5204a Move hidden ApplicationInfo flags into a separate field. 
The public API field android.content.pm.ApplicationInfo.flags can
support only 32 flags. This limit has been reached. As a short term
workaround to enable new public flags to be added, this CL moves flags
which are not public API into a separate new field privateFlags and
renames the affected flags constants accordingly (e.g., FLAG_PRIVILEGED
is now PRIVATE_FLAG_PRIVILEGED).

The new privateFlags field is not public API and should not be used
for flags that are public API.

The flags that are moved out of ApplicationInfo.flags are:
* FLAG_HIDDEN,
* FLAG_CANT_SAVE_STATE,
* FLAG_FORWARD_LOCK, and
* FLAG_PRIVILEGED.

NOTE: This changes the format of packages.xml. Prior to this CL flags
were stored in the "flags" attribute. With this CL, the public flags
are stored in a new "publicFlags" attribute and private flags are
stored in a new "privateFlags" attribute. The old "flags" attribute
is interpreted by using the old values of hidden/private flags.

Change-Id: Ie23eb8ddd5129de3c6e008c5261b639e22182ee5
 2015-02-11 11:06:40 -08:00
Michael Wright
d08860690c Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e automerge: 40bd8f4 
automerge: fa5f1fb

* commit 'fa5f1fbc50050d26535e969ac68b04d318bbaf03':
  Stop active media projections on user switch.
 2015-02-11 18:53:36 +00:00
Michael Wright
fa5f1fbc50 Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e 
automerge: 40bd8f4

* commit '40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55':
  Stop active media projections on user switch.
 2015-02-11 18:43:29 +00:00
Michael Wright
40bd8f416b Merge "Stop active media projections on user switch." into lmp-mr1-dev 
automerge: 3292c0e

* commit '3292c0e2640667e5ef78896653a41c85e7de06c5':
  Stop active media projections on user switch.
 2015-02-11 18:33:00 +00:00
Michael Wright
3292c0e264 Merge "Stop active media projections on user switch." into lmp-mr1-dev 2015-02-11 18:23:55 +00:00
Scott Kennedy
0f5e1975d3 Merge "Add @Nullable to AttributeSet in a couple constructors" 2015-02-11 17:53:50 +00:00
Andrei Kapishnikov
5b4a198abd Merge "Do not throw NullPointerException from PacService" 2015-02-11 17:46:46 +00:00
Pirama Arumuga Nainar
fc8082ac41 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-11 17:23:22 +00:00
Pirama Arumuga Nainar
21761bc5de am 0cc09449: Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 automerge: 1641e19 
* commit '0cc09449b6b1e418a7d04590e28d1336694230ba':
  Store compiled code in Context.getCodeCacheDir()
 2015-02-11 17:23:12 +00:00
Pirama Arumuga Nainar
87556283bc Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 automerge: 1641e19 
automerge: 0cc0944

* commit '0cc09449b6b1e418a7d04590e28d1336694230ba':
  Store compiled code in Context.getCodeCacheDir()
 2015-02-11 17:21:41 +00:00
Pirama Arumuga Nainar
0cc09449b6 Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 
automerge: 1641e19

* commit '1641e192a82e266159e0b82078a8f98ebcd3d8ff':
  Store compiled code in Context.getCodeCacheDir()
 2015-02-11 17:15:47 +00:00
Pirama Arumuga Nainar
1641e192a8 Merge "Store compiled code in Context.getCodeCacheDir()" 
automerge: 3fbbe39

* commit '3fbbe396faffeec6b46796087ad1e075e9a21f0d':
  Store compiled code in Context.getCodeCacheDir()
 2015-02-11 17:11:06 +00:00
Pirama Arumuga Nainar
3fbbe396fa Merge "Store compiled code in Context.getCodeCacheDir()" 2015-02-11 17:08:01 +00:00
Nicolas Prevot
5cfd3d8b51 Merge "Avoid NullPointerException in enableSystemApp if the app is absent." 2015-02-11 17:05:19 +00:00
Geoff Mendal
f54b42eace Merge "Import translations. DO NOT MERGE" 2015-02-11 16:41:37 +00:00
Geoff Mendal
a4c9489383 Import translations. DO NOT MERGE 
Change-Id: I7ff5ac2776891766c5879f6905785f33f588f1b0
Auto-generated-cl: translation import
 2015-02-11 08:06:19 -08:00
Geoff Mendal
36913bf78a Merge "Import translations. DO NOT MERGE" 2015-02-11 14:48:42 +00:00
Geoff Mendal
23032b3f21 Import translations. DO NOT MERGE 
Change-Id: I6498f5f266d79b90c3b41956290838e199e50999
Auto-generated-cl: translation import
 2015-02-11 06:46:44 -08:00
Nicolas Prevot
8b0c8ffb2d Merge "Dont throw an exception for non-system apps when enabling system apps." 2015-02-11 14:27:49 +00:00
Nicolas Prevot
0413046f12 Dont throw an exception for non-system apps when enabling system apps. 
In EnableSystemAppWithIntent: if a non-system app matches the intent:
ignore it instead of throwing an exception.

Change-Id: I64dc9a0bbc1a6bc5e2159a33b7273464ed2518c5
 2015-02-11 14:17:21 +00:00
Narayan Kamath
97a366f9d7 Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.." 2015-02-11 14:01:36 +00:00
Jeff Davidson
535809ab83 am 1d053b86: am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
* commit '1d053b868f9ab3d934956c59c33c7b4bb82ba589':
 2015-02-11 08:50:05 +00:00
Jeff Davidson
1d053b868f am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
* commit '5d8a31c46c947c2c5f56669c00e6c8aea31c47f7':
 2015-02-11 08:44:38 +00:00
Jeff Davidson
2d6063b63c am e4be48e0: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev automerge: 46dbb5b 
* commit 'e4be48e0853bcde90d738031433271c5e41bd5e2':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
 2015-02-11 08:44:34 +00:00
Jeff Davidson
e4be48e085 am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
automerge: 46dbb5b

* commit '46dbb5be4c56e8af603514a3cf2bd7daf0191724':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
 2015-02-11 08:38:35 +00:00
Jeff Davidson
5d8a31c46c am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
* commit '46dbb5be4c56e8af603514a3cf2bd7daf0191724':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
 2015-02-11 08:37:30 +00:00
Jeff Davidson
46dbb5be4c am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
* commit '50996a12a8e859346d5eb3c4569c4e81c9b52a05':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
 2015-02-11 08:30:44 +00:00
Jeff Davidson
50996a12a8 Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 2015-02-11 08:25:27 +00:00
Lorenzo Colitti
b1d3df3269 am 0f0e93dc: am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b 
* commit '0f0e93dc702e97644bacceb7ac08552672a8151d':
 2015-02-11 07:45:49 +00:00
Jeff Davidson
b21298a686 Do not enforce CONTROL_VPN for calls from lockdown VPN. 
Clearly document which methods in Vpn.java are designed to be used to
service a Binder call, and which must therefore check permissions and
clear the calling identity, and which methods are designed for
internal use only and which therefore need not check permission.

Add a new startLegacyVpnPrivileged method which bypasses the
permission checks, to be used by lockdown VPN which is a trusted
system service. Ensure that the existing startLegacyVpn method checks
permissions as this is used whenever we respond to a binder call.

Bug: 19311172
Change-Id: I34f13258ee7481f1356bc523124cf5db068b4972
 2015-02-10 23:41:42 -08:00
Lorenzo Colitti
492def9198 am 2d33b31c: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b automerge: 00c8450 
* commit '2d33b31c86ade166b97cbb9085e0185f765932cb':
  Make getNetworkInfo() take into account VPN underlying networks.
 2015-02-11 07:40:08 +00:00
Lorenzo Colitti
0f0e93dc70 am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b 
* commit 'e1507ac506a4dac327a5cbabede0384836659de0':
 2015-02-11 07:39:23 +00:00
Lorenzo Colitti
e1507ac506 am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b 
* commit '00c8450d2711de57ee45f66cae1050dbca98d1f5':
  Make getNetworkInfo() take into account VPN underlying networks.
 2015-02-11 07:33:10 +00:00