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

163373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
dfe8fe3fcf Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:18 +00:00
Geoff Mendal
39b03e7636 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:58 +00:00
Geoff Mendal
7c958e2df0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:46 +00:00
Geoff Mendal
dc43cc88f0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:17 +00:00
Geoff Mendal
5c7e4d9940 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:58 +00:00
Geoff Mendal
be5aa9dda3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:25 +00:00
Geoff Mendal
6113edf578 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:58:47 +00:00
Geoff Mendal
0804199a6e Import translations. DO NOT MERGE 
Change-Id: Ia9e245c983da6b04f3098269e611d1e193899be8
Auto-generated-cl: translation import
 2015-02-12 14:53:58 -08:00
Geoff Mendal
b008c8f73a Import translations. DO NOT MERGE 
Change-Id: I44a5695c1b18476df2114f16e35fbcbf2a0d99c1
Auto-generated-cl: translation import
 2015-02-12 14:51:47 -08:00
Geoff Mendal
899b20e374 Import translations. DO NOT MERGE 
Change-Id: Ic17d83f48e83832042cd417f1196e6f108ad1724
Auto-generated-cl: translation import
 2015-02-12 14:46:15 -08:00
Geoff Mendal
4e7f6a425c Import translations. DO NOT MERGE 
Change-Id: I8cdc3195ba20c25fab9de6c0063667f5250e6e51
Auto-generated-cl: translation import
 2015-02-12 14:42:44 -08:00
Geoff Mendal
3e94f5644c Import translations. DO NOT MERGE 
Change-Id: Ia8018b29159267ee751a6eb84713409f17fca2b8
Auto-generated-cl: translation import
 2015-02-12 14:40:46 -08:00
Geoff Mendal
44f7bdd2e7 Import translations. DO NOT MERGE 
Change-Id: I9c7b354d532f6631e9e1e1500e0c544379f08b2e
Auto-generated-cl: translation import
 2015-02-12 14:35:01 -08:00
Geoff Mendal
926839346d Import translations. DO NOT MERGE 
Change-Id: I687ccfbddefdf63cdf6b5ef561dbf8261d66ce73
Auto-generated-cl: translation import
 2015-02-12 14:32:53 -08:00
Jim Miller
4bbd3cb3e8 am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 
* commit 'b1e80278f80585a1c3f46dbc578bbbafbcbd80c1':
  Fix accessibility focus bug in statusbar
 2015-02-12 22:04:28 +00:00
Jim Miller
b1e80278f8 am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 
* commit 'b2ff8d9a3e5f279e7a60a12f9192e43081e2eef9':
  Fix accessibility focus bug in statusbar
 2015-02-12 21:55:06 +00:00
Jim Miller
b2ff8d9a3e Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 2015-02-12 21:48:11 +00:00
Geoff Mendal
a673af77d9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 19:13:54 +00:00
Geoff Mendal
ceb7ae3170 Import translations. DO NOT MERGE 
Change-Id: Idd108e5eb791007b3604c67ce4a0853a368a445e
Auto-generated-cl: translation import
 2015-02-12 10:51:28 -08:00
Jeremy Joslin
1267462c0b am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit 'f456d4dcc042581cb2a3ba540538898f2cc925b7':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:47:14 +00:00
Jeremy Joslin
f456d4dcc0 am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:41:17 +00:00
Jeremy Joslin
20be0e25ba Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 2015-02-12 18:34:03 +00:00
Benjamin Franz
dd0027cfda am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit '40ab8bb22979b9e7c76e016b861319f6103eb800':
  Fix the javadocs for lock task mode intents.
 2015-02-12 16:52:34 +00:00
Benjamin Franz
40ab8bb229 am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
  Fix the javadocs for lock task mode intents.
 2015-02-12 16:45:06 +00:00
Benjamin Franz
c70d0e71c0 Fix the javadocs for lock task mode intents. 
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
 2015-02-12 16:12:58 +00:00
Eino-Ville Talvala
f5d304636d am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
* commit '4fa3a80b6cefdc500de6c7daacc7ef3e160a0543':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 05:48:50 +00:00
Eino-Ville Talvala
4fa3a80b6c am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
* commit 'a5f301c7fb048461197a6032f66b35772a3157f9':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 05:39:05 +00:00
Eino-Ville Talvala
a5f301c7fb Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 2015-02-12 05:33:28 +00:00
Jim Miller
959ea56f34 Fix accessibility focus bug in statusbar 
The root view of the new uber statusbar should not be focusable.

Based on history, it looks like this was an oversight when this view
was refactored.

Fixes bug 19296202

Change-Id: Ib7f6908c30ab37384aa50f4fa4198c15593a96a4
 2015-02-11 20:43:04 -08:00
Lorenzo Colitti
b0dfaad8c2 am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev 
* commit 'f99551d8a149c1a80dddd6350efcfbd53d58e151':
  Make reportInetCondition revalidate if the report differs from our state
 2015-02-12 02:56:56 +00:00
Lorenzo Colitti
f99551d8a1 am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev 
* commit 'c7ccc393b470220710f566d447412d93f7f8d21b':
  Make reportInetCondition revalidate if the report differs from our state
 2015-02-12 02:43:03 +00:00
Lorenzo Colitti
c7ccc393b4 Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev 2015-02-12 02:30:56 +00:00
Jeremy Joslin
fcde58f155 Update Javadoc for EXTRA_NETWORK. 
Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
 2015-02-11 18:28:57 -08:00
Adam Powell
97e0ba6912 am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev 
* commit 'b73e029fea53fd5aeaf01ad7ba15560329d8de1c':
  Add DENSITY_280
 2015-02-12 02:25:29 +00:00
Adam Powell
b73e029fea am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev 
* commit '0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
  Add DENSITY_280
 2015-02-12 02:13:03 +00:00
Adam Powell
0ec652cf72 Merge "Add DENSITY_280" into lmp-mr1-dev 2015-02-12 02:08:04 +00:00
Eino-Ville Talvala
b0acf7fcfa Legacy: Only set user surface dimensions on output surfaces 
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.

Bug: 16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
 2015-02-11 16:58:10 -08:00
Craig Mautner
18d836b618 Merge "Don't relayout based on a window that isn't visible" into lmp-mr1-modular-dev 2015-02-11 22:27:06 +00: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
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
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
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
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
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
Lorenzo Colitti
00c8450d27 Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev 
automerge: c38b90b

* commit 'c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4':
  Make getNetworkInfo() take into account VPN underlying networks.
 2015-02-11 07:24:50 +00:00
Lorenzo Colitti
c38b90bb6b Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev 2015-02-11 07:18:17 +00:00