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

144554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ye Wen
bb1c3eeafe am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit 'dbbd116c9d1e67b67213e2be14f0198cf6e1b524':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 19:05:41 +00:00
Ye Wen
38a8ec0db3 am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit 'a7d1baac96f73a64aa6e76a494724c2ed29a5456':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 18:59:30 +00:00
Jason Monk
a979c5573b am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev 
* commit '01f4253b2d2d6e8e198f0adc57c9eb73ce8c136f':
  Make the 'locked' lock task not lock keyguard on exit
 2014-07-23 18:56:27 +00:00
Jason Monk
a6de67773b am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev 
* commit '7143b71c9daf0ed4e73eabd190a445f14d9eafc0':
  Make the 'locked' lock task not lock keyguard on exit
 2014-07-23 18:51:26 +00:00
Wei Wang
4f22c47d87 am 03aeeb29: am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '03aeeb294657a616710aca3ff8e1ca5080a1b67b':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:50:00 +00:00
Wei Wang
7c7c448499 am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '6d630c7575f9e33632acf398201ae4226ce800ed':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:47:10 +00:00
Jason Monk
8ed4d5ac66 Merge "Make the 'locked' lock task not lock keyguard on exit" into lmp-dev 2014-07-23 18:38:23 +00:00
Alan Viverette
3f5c0f942f am b1e9a890: am cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev 
* commit 'b1e9a890a167cc63aa5bd4656a6643bb41addc73':
  Ensure ripple mask gets updated in public constructor
 2014-07-23 18:33:37 +00:00
Alan Viverette
ea85c722bb am cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev 
* commit 'cc379868058f453946f03c7c0fdb89bd2076c8d4':
  Ensure ripple mask gets updated in public constructor
 2014-07-23 18:30:36 +00:00
Jeff Davidson
44e2be10f6 am fb28414b: am d0868c89: Implement VpnService.setBlocking(). 
* commit 'fb28414b5a1d32e023c74c755fa0283290414606':
  Implement VpnService.setBlocking().
 2014-07-23 18:28:08 +00:00
Jeff Davidson
397c33799a am d0868c89: Implement VpnService.setBlocking(). 
* commit 'd0868c89eac6df2adbbdcdee7fe24dba943736a7':
  Implement VpnService.setBlocking().
 2014-07-23 18:23:50 +00:00
Brian Attwell
85511418d4 am 1a038e57: am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact 
* commit '1a038e572ec718b2364650144dc6d6969a4a2410':
  Add PICK_JOIN_CONTACT_ACTION action contact
 2014-07-23 18:20:03 +00:00
Chris Craik
99bc64e721 am 97d572ec: am f2ecf428: Merge "Build layer damage bounds for shadows" into lmp-dev 
* commit '97d572ecb4804fc764a2bc99d0a0f6dddfe6fbd8':
  Build layer damage bounds for shadows
 2014-07-23 18:19:58 +00:00
Jeff Davidson
6bbf39cf6b Implement VpnService.setBlocking(). 
Bug: 12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
 2014-07-23 11:18:57 -07:00
Brian Attwell
b8bf2598f8 am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact 
* commit '41b62ac75082d823c05571e7d04c8cc5453218c9':
  Add PICK_JOIN_CONTACT_ACTION action contact
 2014-07-23 18:15:55 +00:00
Chris Craik
08ac4977de am f2ecf428: Merge "Build layer damage bounds for shadows" into lmp-dev 
* commit 'f2ecf428a0311d0b07ae35d743f5165384812547':
  Build layer damage bounds for shadows
 2014-07-23 18:15:51 +00:00
Brian Attwell
e98a95c156 Add PICK_JOIN_CONTACT_ACTION action contact 
This ContactsContract change is needed by ag/509090

Bug: 16190113
Change-Id: I0f96286bdf45015148d2e84f7fe7aac5b23e1ba2
 2014-07-23 18:11:13 +00:00
Ye Wen
e5ebd4bc76 Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 2014-07-23 17:52:05 +00:00
Ye Wen
b87875eb88 Infer legacy network type for ConnectivityManager.requestNetwork 
ConnectivityManager.requestNetwork pass TYPE_NONE to
sendRequestForNetwork which prevents it from being used with legacy API
requestRouteToHostAddress. This CL infers the legacy network type
automatically from the network capabilities.

b/16324360

Change-Id: I591d38f875f42f56e8cfc157db2069c9eee0ee26
 2014-07-23 11:41:17 -07:00
Jason Monk
2961ce599e Make the 'locked' lock task not lock keyguard on exit 
While here also fix mIsLockTaskLocked to actually be set to a value
so that it can be used.

Bug: 16347391
Change-Id: I27416f4787b28d19d84f895889eea1d3202c1759
 2014-07-23 17:33:13 +00:00
Svet Ganov
5374ff295e am 5cc27606: am f4348489: Merge "Adding shell commands for grant/revoke of bind app widget permisison." into lmp-dev 
* commit '5cc27606f41f95810c8e7ce4e7855f4c4fae409c':
  Adding shell commands for grant/revoke of bind app widget permisison.
 2014-07-23 17:20:08 +00:00
RoboErik
397beaf432 am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes 
* commit '67430c74d436e58d92b0d53ffdca1de5ded20c58':
  Switch Session APIs over to AudioAttributes
 2014-07-23 17:20:01 +00:00
Svet Ganov
dc25a3df33 am f4348489: Merge "Adding shell commands for grant/revoke of bind app widget permisison." into lmp-dev 
* commit 'f4348489228c244578719b20bc3d12317761378f':
  Adding shell commands for grant/revoke of bind app widget permisison.
 2014-07-23 17:15:35 +00:00
RoboErik
f82d14a209 am 80380f82: Switch Session APIs over to AudioAttributes 
* commit '80380f827a2147d436494b66193b7d59763de25b':
  Switch Session APIs over to AudioAttributes
 2014-07-23 17:15:32 +00:00
Dianne Hackborn
bfa2253e4b am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 
* commit '9566ecd9fbac848ba576282fd9ee315c33b28f0e':
  Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
 2014-07-23 17:12:01 +00:00
Sander Alewijnse
8e1a01a49c am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'ce1088a641b0027df04e3388a73423294262d547':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:11:57 +00:00
RoboErik
9db9bf7034 Switch Session APIs over to AudioAttributes 
The session apis were using audioStream in several places. This
updates them to use AudioAttributes instead.

bug:16403289
Change-Id: Ic4da9ca5fbea2536e80c71503bd9a9bf7f346997
 2014-07-23 17:08:32 +00:00
Dianne Hackborn
65130b704d am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 
* commit '7939993150214d6d717d46246c33d43652ec806a':
  Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
 2014-07-23 17:07:35 +00:00
Sander Alewijnse
f5d6516f4b am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'fcb490a2d3b1f28a375e40b44201882ff171bfa5':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:07:32 +00:00
Jeff Davidson
b317bbbac0 am dfe72ae3: am 69c976c6: Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev 
* commit 'dfe72ae322567b6ac7be6644ea0811beec0a4d4b':
  Expose NETWORK_SCORE_SERVICE as @SystemApi.
 2014-07-23 16:55:20 +00:00
Jeff Davidson
53c7fce508 am 8410ced8: am 607281ff: Delete most network scorer tests from coretests. 
* commit '8410ced8134bc81ea726f075a70ae6556b8ca3fe':
  Delete most network scorer tests from coretests.
 2014-07-23 16:55:16 +00:00
Jeff Davidson
6d5570ee36 am 69c976c6: Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev 
* commit '69c976c665ddde192157cbf9a4cc31df83af1c75':
  Expose NETWORK_SCORE_SERVICE as @SystemApi.
 2014-07-23 16:46:23 +00:00
Jeff Davidson
9a70f97a74 am 607281ff: Delete most network scorer tests from coretests. 
* commit '607281ffc1ac13ecc3d51c52d2d0a57c33d2c358':
  Delete most network scorer tests from coretests.
 2014-07-23 16:46:20 +00:00
Jae Seo
a54c87e606 am 41f1050a: am e3316cfe: Merge "TIF: Use @SystemApi for APIs that we intend to open to OEMs" into lmp-dev 
* commit '41f1050aa3c03a7625f13ad0b2975ef2dc9ef672':
  TIF: Use @SystemApi for APIs that we intend to open to OEMs
 2014-07-23 16:46:13 +00:00
Jae Seo
ef5450ecf5 am e3316cfe: Merge "TIF: Use @SystemApi for APIs that we intend to open to OEMs" into lmp-dev 
* commit 'e3316cfefd3ca2f6aa4928a39f62eea9a67c4e53':
  TIF: Use @SystemApi for APIs that we intend to open to OEMs
 2014-07-23 16:40:47 +00:00
Jeff Davidson
3824db6141 Delete most network scorer tests from coretests. 
Anything which tests public API functionality will be moved to a
compatibility test suite.

The only remaining test is NetworkScorerAppManagerTest, which contains
unit tests for an internal helper class that is not (and should not
be) exposed via @SystemApi or otherwise.

Bug: 16355542
Change-Id: I478da97d3a4d09407992af37e45466dc484fa8cf
 2014-07-23 09:40:24 -07:00
Jungshik Jang
01b9a90a80 am a6501c7a: am 0062e49d: Merge "Fix unknown tag @throw" into lmp-dev 
* commit 'a6501c7aeeeba1d93948d226c7b83d5f757e9297':
  Fix unknown tag @throw
 2014-07-23 14:38:55 +00:00
Jungshik Jang
4630072c78 am 0062e49d: Merge "Fix unknown tag @throw" into lmp-dev 
* commit '0062e49d753903cf440353085f2ed31a17c23ab0':
  Fix unknown tag @throw
 2014-07-23 14:34:51 +00:00
Chris Wren
941d57ad86 am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit '43387c0c2cfc0b319f3a6884e5008f1d18e0c8b2':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:28:54 +00:00
Chris Wren
3ec0f95def am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit 'eb6f138b8156f292acca1026a9df3b9132aea63e':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:23:46 +00:00
Chris Wren
1031c97485 Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
 2014-07-23 09:45:25 -04:00
Chris Wren
9246171277 am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev 
* commit '1ef27c1c9e9fb035951ca88881399fa3f57564df':
  Revert "Honor the sort and group keys for notification ranking."
 2014-07-23 12:59:09 +00:00
Santos Cordon
7989f57403 am 22900e4e: am ca8e44fb: Merge "Change display Strings to CharSequence (1/3)" into lmp-dev 
* commit '22900e4e8dbee3d02bca1fc3bed5f7a7205596e3':
  Change display Strings to CharSequence (1/3)
 2014-07-23 12:59:05 +00:00
Chris Wren
636f360ba5 am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking. 
* commit '14d65e68ad753c2384785061ea6e470a995dcab6':
  Honor the sort and group keys for notification ranking.
 2014-07-23 12:59:01 +00:00
Narayan Kamath
435d1047b1 am f6aa06c8: am 3bd0b010: Merge "Add an internal API to get all asset locales." into lmp-dev 
* commit 'f6aa06c89146943c034df48c94a7fdc57a715693':
  Add an internal API to get all asset locales.
 2014-07-23 12:58:55 +00:00
Narayan Kamath
f1a316e750 am 0c479058: am c0fb18a2: Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev 
* commit '0c479058c2660b746f9ce19659d6db6b328af13a':
  Remove copy of Locale.adjustLanguageCode.
 2014-07-23 12:58:51 +00:00
Bryan Mawhinney
645a63bc4a am 64ccca0d: am d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
* commit '64ccca0d703bb176799216fa84e17bec352f02d3':
  Store actions passed to MediaStyle.setShowActionsInCompactView in extras
 2014-07-23 12:58:47 +00:00
Nicolas Prevot
2a9844c5cc am b5b6f33e: am ea6f0c52: Fixing cross-user content. 
* commit 'b5b6f33e777a62fc400e21ab73c2a78ba1c974e9':
  Fixing cross-user content.
 2014-07-23 12:58:43 +00:00
Jungshik Jang
cfd1fa6357 am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService. 
* commit 'c1d403f661b6c7b9339e983e7f89a4c7e287e72b':
  Add startTimerRecording api to IHdmiControlService.
 2014-07-23 12:58:38 +00:00
Youngsang Cho
74065729c4 am 5b0fca67: am 76f8d671: Block logging watched histories for passthrough inputs 
* commit '5b0fca67b75204fb886e541719e6f049ed932dc5':
  Block logging watched histories for passthrough inputs
 2014-07-23 12:58:34 +00:00