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

159401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Gilmore
6eb42f672f am 54b32cbd: am bb78bf1d: am c31a73c1: am 343c4193: Merge "Adding app quality criteria." into lmp-docs 
* commit '54b32cbd242edd28466b594b9e8d0b456373f2f0':
  Adding app quality criteria.
 2014-11-18 05:54:00 +00:00
Eric Gilmore
54b32cbd24 am bb78bf1d: am c31a73c1: am 343c4193: Merge "Adding app quality criteria." into lmp-docs 
* commit 'bb78bf1da5d0eebae311955662a3c36cb4d0ec74':
  Adding app quality criteria.
 2014-11-18 05:50:51 +00:00
Eric Gilmore
bb78bf1da5 am c31a73c1: am 343c4193: Merge "Adding app quality criteria." into lmp-docs 
* commit 'c31a73c1870d12de1c213cbd68cc358b74f58039':
  Adding app quality criteria.
 2014-11-18 05:44:48 +00:00
Eric Gilmore
c31a73c187 am 343c4193: Merge "Adding app quality criteria." into lmp-docs 
* commit '343c4193c0a1974e996eecdcab8d70cdcd4184a0':
  Adding app quality criteria.
 2014-11-18 05:36:42 +00:00
Eric Gilmore
343c4193c0 Merge "Adding app quality criteria." into lmp-docs 2014-11-18 05:30:56 +00:00
Eric Gilmore
a4ebec8f55 Adding app quality criteria. 
Change-Id: Id4b9f0632642b9fd3a4312ec3bc61136a6043436
 2014-11-17 21:22:10 -08:00
Griff Hazen
89f0224997 am 9c5be4ed: Improve doc for {get,set}HintAvoidBackgroundClipping 
* commit '9c5be4eddd1607846c189e403fd74fd288ce7976':
  Improve doc for {get,set}HintAvoidBackgroundClipping
 2014-11-18 01:56:57 +00:00
Griff Hazen
9c5be4eddd Improve doc for {get,set}HintAvoidBackgroundClipping 
Bug: 18414403
Change-Id: I4cc069ca8f13d7521aa94e3c18f776de69280e2f
 2014-11-17 17:47:50 -08:00
Lorenzo Colitti
ff01f81f1e am e9f7e65c: Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev 
* commit 'e9f7e65c4090d7ea97bc065f6fefd58c2fcebd47':
  Populate 464xlat LinkProperties only when the interface comes up.
 2014-11-18 00:30:10 +00:00
Lorenzo Colitti
e9f7e65c40 Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev 2014-11-18 00:25:53 +00:00
Shishir Agrawal
2f74e913c8 am c9f1b3a0: Merge "Add new API to set voicemail number." into lmp-mr1-dev 
* commit 'c9f1b3a0e8f64ae75f71e363c612b8734031b1b2':
  Add new API to set voicemail number.
 2014-11-17 23:52:48 +00:00
Shishir Agrawal
c9f1b3a0e8 Merge "Add new API to set voicemail number." into lmp-mr1-dev 2014-11-17 23:49:29 +00:00
Winson Chung
fc7ebb934e am b0791173: Merge "Add some flags to reduce memory usage on svelte devices." into lmp-mr1-dev 
* commit 'b079117384c038e1c02fb58fefafcb2a72cb0cf3':
  Add some flags to reduce memory usage on svelte devices.
 2014-11-17 23:06:15 +00:00
xinhe
b596bffdaa am a8e6d6fd: Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 
* commit 'a8e6d6fd993c449b442be8c19f6c2688b75c018d':
  air plane mode only send to the owner through the quick setting
 2014-11-17 22:59:20 +00:00
Robert Greenwalt
aeb8dc1673 am 5e4e2b58: Merge "telephony: Add tethering profiles to support mvno" into lmp-mr1-dev 
* commit '5e4e2b589e4a89cefced2b4d69e7f6cf68e26873':
  telephony: Add tethering profiles to support mvno
 2014-11-17 22:59:09 +00:00
Robert Greenwalt
33c34d6c14 am 9a53c113: Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev 
* commit '9a53c1137b0a80544fb8ad330718cc8bd35be959':
  telephony: Change string to string-array config_tether_apndata to support mvno
 2014-11-17 22:58:56 +00:00
Andres Morales
e261ede827 am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 
* commit '5aadd5b6fa8ee9f09cd4870c8f104c1e611aebcd':
  Add UserHandle to BeamShareData
 2014-11-17 22:58:40 +00:00
Winson Chung
5a812d4e69 am fe79d62d: Merge "Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)" into lmp-mr1-dev 
* commit 'fe79d62db3f5de7671763b4bbafc83feb1c7694c':
  Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)
 2014-11-17 22:58:30 +00:00
Geoff Mendal
db5901244a am 6e523a07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6e523a077f3f6257019057091d8a962ff56fe882':
  Import translations. DO NOT MERGE
 2014-11-17 22:58:24 +00:00
Craig Stout
913f829549 am 36fbc437: Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev 
* commit '36fbc43787923da4e7b36761fa287a36e15dab29':
  Use dark theme for usb dialogs on television.
 2014-11-17 22:58:18 +00:00
Jeff Davidson
0e78487482 am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '9a1da68bf7980449a5ee5d6fa9d9686b04d667ff':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-17 22:58:12 +00:00
Jeff Davidson
e6bc5adf2d am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 
* commit 'e0cb56b02eb2bb52a537b32c5d3f5360b9718c8a':
  Enforce VPN control "permission" with an actual permission.
 2014-11-17 22:58:05 +00:00
Winson Chung
b079117384 Merge "Add some flags to reduce memory usage on svelte devices." into lmp-mr1-dev 2014-11-17 22:56:32 +00:00
Winson Chung
96d7041866 Add some flags to reduce memory usage on svelte devices. 
Bug: 10918599
Change-Id: I235413a243d47fdd9be4a27f6bd726311a51cb6f
 2014-11-17 14:52:29 -08:00
xinhe
a8e6d6fd99 Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 2014-11-17 22:18:11 +00:00
Robert Greenwalt
5e4e2b589e Merge "telephony: Add tethering profiles to support mvno" into lmp-mr1-dev 2014-11-17 22:07:29 +00:00
Robert Greenwalt
9a53c1137b Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev 2014-11-17 22:04:49 +00:00
Andres Morales
5aadd5b6fa Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 2014-11-17 21:53:58 +00:00
Winson Chung
fe79d62db3 Merge "Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)" into lmp-mr1-dev 2014-11-17 21:43:51 +00:00
Geoff Mendal
df944b30c2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 21:42:48 +00:00
Geoff Mendal
6e523a077f Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 21:33:38 +00:00
Craig Stout
36fbc43787 Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev 2014-11-17 21:28:25 +00:00
Geoff Mendal
4e214b0399 Import translations. DO NOT MERGE 
Change-Id: I8dba08bbfd5fa95d472a82968b1bf16a756d7504
Auto-generated-cl: translation import
 2014-11-17 13:10:15 -08:00
Geoff Mendal
44e4ff746a Import translations. DO NOT MERGE 
Change-Id: I67abea60870f468d3ad9a6be7ee600de99b8ff54
Auto-generated-cl: translation import
 2014-11-17 13:07:17 -08:00
Jeff Davidson
9a1da68bf7 Expose a SystemApi method to prepare a VPN without consent. 
This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.

The API requires a system-privileged permission, CONTROL_VPN.

Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7
 2014-11-17 21:03:10 +00:00
Jeff Davidson
e0cb56b02e Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 2014-11-17 21:02:10 +00:00
Christopher Tate
93fb155344 am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev 
* commit '94d963381d7bd75e60da1c3038c7970e47d2ac35':
  Don't crash just because invalid datasets were offered for restore
 2014-11-17 20:59:46 +00:00
Geoff Mendal
cf71886c2f am 9d8c7598: (-s ours) am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9d8c759879b7d56a7bf1678f7f1a1a8807ce5636':
  Import translations. DO NOT MERGE
 2014-11-17 20:55:25 +00:00
Craig Stout
9eef7bce56 Use dark theme for usb dialogs on television. 
b/16488215

Change-Id: I8ea2a184b2df36e3f55ba5bd0e8fb121ef0ed48e
 2014-11-17 12:36:15 -08:00
Christopher Tate
94d963381d Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev 2014-11-17 20:20:12 +00:00
Geoff Mendal
9d8c759879 am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '27b8033175a748438891dc9da498ff354cce82a0':
  Import translations. DO NOT MERGE
 2014-11-17 19:51:34 +00:00
Geoff Mendal
e8e6b933a7 am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c81a3e16e77c83d30395d36dc907cbef80dd7ac6':
  Import translations. DO NOT MERGE
 2014-11-17 19:48:07 +00:00
Winson Chung
fe03b40da4 Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798) 
Change-Id: I46a324b3b6acba6b6519506ff2431d285e3b57f9
 2014-11-17 11:47:09 -08:00
Geoff Mendal
27b8033175 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-17 19:45:13 +00:00
Geoff Mendal
6558805316 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 19:44:50 +00:00
Adam Lesinski
06d8b7b8d2 am cd6f00c3: Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 
* commit 'cd6f00c3a05717862a88b7409d11176ae53fd9a9':
  Implement back-tracking when searching for attributes in XML or resource bag
 2014-11-17 19:43:24 +00:00
Geoff Mendal
c81a3e16e7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 19:43:10 +00:00
Adam Lesinski
cd6f00c3a0 Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 2014-11-17 19:39:17 +00:00
xinhe
98e25fc377 air plane mode only send to the owner through the quick setting 
It should send to all the uesers as it behaves in setting

Bug:18353278
Change-Id: Ib46a97e30bfba73dd78fab0c8139d6ccb7ad210f
 2014-11-17 11:35:01 -08:00
Jim Miller
58b9ee2826 am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev 
* commit 'cd75f59f8cdeda95a50155ad0c9f4abd559037ec':
  Fix deadlock caused by synchronous setOccluded() method in keyguard
 2014-11-17 19:34:37 +00:00