Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,360 Commits 3 Branches 0 Tags
c179e4adc8cf01db18c60441c7157ded028fef2f
Commit Graph

43654 Commits

Author SHA1 Message Date
Amith Yamasani
c179e4adc8 am f6c8169a: am 26d8d1d5: Merge "Fix singleUser provider grants" into lmp-mr1-dev automerge: 775d104 
* commit 'f6c8169a684183d5149fc7d41b92adbb1700dab5':
  Fix singleUser provider grants
 2014-11-07 03:55:33 +00:00
Amith Yamasani
f6c8169a68 am 26d8d1d5: Merge "Fix singleUser provider grants" into lmp-mr1-dev automerge: 775d104 
* commit '26d8d1d5cb6553686028948a63c5d3c507f0b40c':
  Fix singleUser provider grants
 2014-11-07 00:06:48 +00:00
Justin Koh
402a360111 am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '4ca342cdba6fb2637415cfeb6e579cc662763daf':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-07 00:05:54 +00:00
Amith Yamasani
775d104db2 Merge "Fix singleUser provider grants" into lmp-mr1-dev 2014-11-06 20:51:02 +00:00
Justin Koh
2d42f48449 am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-06 20:33:36 +00:00
Adrian Roos
e8dce89a83 am 34c45bb9: am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev 
* commit '34c45bb953f3fc230207bacb1a3b4d073068ca9f':
  Round charging indication to nearest minute
 2014-11-06 16:36:04 +00:00
Adrian Roos
34c45bb953 am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev 
* commit 'b2a6c7b83f894922663e7144048264af96239a1e':
  Round charging indication to nearest minute
 2014-11-06 16:31:43 +00:00
Adrian Roos
418f4ed077 Merge "Round charging indication to nearest minute" into lmp-mr1-dev 2014-11-06 16:22:06 +00:00
Jim Miller
cc56956025 am 767ae175: am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '767ae175fab5a93f4948b3722549448eb4b55e41':
  Update TrustAgentService API after review
 2014-11-06 03:12:08 +00:00
Jim Miller
767ae175fa am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '6230cdf5721f11660e2c0fec1c5695346a9001d0':
  Update TrustAgentService API after review
 2014-11-06 03:07:09 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
Jim Miller
e303bf4435 Update TrustAgentService API after review 
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
 2014-11-05 18:17:56 -08:00
Jeff Davidson
83bdea71c9 am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b 
automerge: f680c84

* commit 'f680c8434a737873c98231f6d9863e71c43a6783':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 02:09:10 +00:00
Jeff Davidson
f680c8434a am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b 
* commit '63226dd8f3570bd3b28e4241668843385ba99c2d':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 01:48:45 +00:00
Jeff Davidson
24f535b873 Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev 2014-11-06 01:25:04 +00:00
Robert Greenwalt
ed9fb4a122 am c47a9127: am a4f34edd: am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 
* commit 'c47a91273c42a2ebd9f6e154d99dcdc51a185609':
  Fix Legacy typing of net-specific requests.
 2014-11-06 00:12:52 +00:00
George Mount
ac418e07f7 am a3fdc18f: am aa627037: am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'a3fdc18fd7a8191d7452e63823d7c4589dd5c894':
  Cancel animation when target changes.
 2014-11-06 00:12:39 +00:00
Amith Yamasani
7d2d4fd55e Fix singleUser provider grants 
Fake the Uri for grant check, if we're checking access to
a singleUser provider. Inject the userId in the authority
so that the grant can be matched properly.

Bug: 18194892
Change-Id: I4a55ce593ac21722f394e89e13350aa205d76336
 2014-11-05 15:46:09 -08:00
Robert Greenwalt
c47a91273c am a4f34edd: am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 
* commit 'a4f34eddb3b46a81ce90a9eded54b35b62e40337':
  Fix Legacy typing of net-specific requests.
 2014-11-05 23:45:03 +00:00
Robert Greenwalt
7efdb83cee Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 2014-11-05 23:36:01 +00:00
George Mount
a3fdc18fd7 am aa627037: am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'aa6270375263ebf6da4f2f0de31df808eb278563':
  Cancel animation when target changes.
 2014-11-05 23:15:00 +00:00
Robert Greenwalt
06314e4eab Fix Legacy typing of net-specific requests. 
We're starting to get network requests for specific SIMs
and the Legacy Type Inference was broken because the incoming
request included a network specifier while the legacy requests
it was compared with did not.  Only compare the things we care
about.

bug:18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694
 2014-11-05 15:06:20 -08:00
George Mount
c838b67774 Merge "Cancel animation when target changes." into lmp-mr1-dev 2014-11-05 23:04:18 +00:00
Jeff Davidson
e56f2bb5ec Allow apps with SCORE_NETWORKS to set the active scorer. 
This allows for a more streamlined UX in the current world, where
scorer apps are trusted (by virtue of being in /system/priv-app).
Trusted apps can continue to use the system dialog for consent, but
they may also set the scorer directly, under the assumption that they
are using their own consent UX to explain the feature to the user.

Bug: 16577529
Change-Id: I2a6edb7f1f688aaacf9b0152fa1da1a88636c3dc
 2014-11-05 14:25:20 -08:00
Jeff Davidson
3527aa01cd am fb68a976: am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'fb68a9762087a262146eec5d0e0d3fbdbdf25b6b':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:48:16 +00:00
Jeff Davidson
fb68a97620 am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'dd40ccf36203c740aea3849f54495d1287d02b2b':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:43:10 +00:00
Jeff Davidson
b42bdef51c Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 2014-11-05 21:33:16 +00:00
John Spurlock
4901badeca am 7847a7f8: am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6 
* commit '7847a7f8f4b682e6776439058216796d351cb693':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 20:52:59 +00:00
John Spurlock
7847a7f8f4 am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6 
* commit '6ccb72e9940df9b50a213fa84483ed5da9780cd0':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 20:43:18 +00:00
Paul Jensen
66d03ca8c6 am a21622df: am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev automerge: 6ad91cb 
* commit 'a21622df7e1368e7321059a5f5047d2011fd71e5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 20:15:46 +00:00
Paul Jensen
a21622df7e am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 
automerge: 6ad91cb

* commit '6ad91cbce2ce7eb175086894e4ee27e1ca4d2e75':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 20:00:46 +00:00
John Spurlock
2f9e7f6d8b Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev 2014-11-05 19:17:39 +00:00
John Spurlock
cc30c8d729 Zen: Add the ability to enter "None" mode during downtime. 
Updates to the shared config structure and the service backend.

Bug: 16373455
Change-Id: I45761690ba6b32eb81c9e2a5c1f2d4adad93e58d
 2014-11-05 14:12:30 -05:00
Paul Jensen
021a95f761 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 2014-11-05 19:05:09 +00:00
George Mount
253c6c47df am 7291d7b2: Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 automerge: dd185b6 
* commit '7291d7b2c58de6670e1fc6a3af4b4b6c200d1ed0':
  Fix javadoc.
 2014-11-05 18:47:33 +00:00
John Spurlock
a667028207 am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 automerge: 513f260 
* commit '96171f08c121a7d15a6a8cbdb28e49c917418c1f':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 18:47:27 +00:00
George Mount
7291d7b2c5 Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 
automerge: dd185b6

* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
  Fix javadoc.
 2014-11-05 18:03:51 +00:00
John Spurlock
96171f08c1 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 
automerge: 513f260

* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:42:30 +00:00
George Mount
8b26674aa1 Merge "Fix javadoc." into lmp-mr1-dev 2014-11-05 15:22:43 +00:00
Adrian Roos
874b35b836 Round charging indication to nearest minute 
Bug: 18177374
Change-Id: I4eb7fcac83398a4d8432bf092d8d91506646b5a1
 2014-11-05 16:11:10 +01:00
John Spurlock
0bdefb9953 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 2014-11-05 14:47:20 +00:00
Paul Jensen
c53113b37f Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties() 
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853
 2014-11-05 09:35:26 -05:00
John Spurlock
37bc92cc23 Zen: Create a new exit condition for "next alarm". 
- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
 2014-11-05 08:46:01 -05:00
Jungshik Jang
4acb768ce8 am af45240b: am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit 'af45240bf06faa649cc60be560159de0d246b6a9':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:33:33 +00:00
Jungshik Jang
af45240bf0 am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '9ae3fe48d912d9135684d435d282fa2bb4929a2e':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:29:24 +00:00
Jungshik Jang
090354861a Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 2014-11-05 05:54:15 +00:00
Alan Viverette
8df94b5659 am b6416716: am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit 'b6416716ad875a800c982dda77bafe910f9ed2d6':
  Use default token instead of wrapped window manager
 2014-11-05 05:03:59 +00:00
Alan Viverette
b6416716ad am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
  Use default token instead of wrapped window manager
 2014-11-05 04:56:40 +00:00
Alan Viverette
9342b049b9 Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 2014-11-05 04:44:22 +00:00
Jungshik Jang
326aef0c94 Add recorder address to all recording listerner apis. 
It enables to recognize which recorder reports record status.

Bug: 18248734
Change-Id: I248ad77212ce584dc16863cbe00639e7ac3c184a
 2014-11-05 13:32:52 +09:00